[Gaim-commits] CVS: gaim/src .cvsignore,1.12,1.13 Makefile.am,1.237,1.238

[Gary K. <amc...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8454/src

Modified Files:
	.cvsignore Makefile.am 
Log Message:
This is a refactoring of the dbus service directory detection stuff.  It was originally taken from guifications and that version had problem when a prefix was specificed to configure.  Basically it would always try to install into the system directory regardless of --prefix.  Anyways, this new code takes that into consideration.
Also, I changed the way gaim.service is generated.  It's now created from a .in file and has been relocated to the top of the source tree.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/gaim/gaim/src/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -p -r1.12 -r1.13
--- .cvsignore	21 Dec 2005 00:08:21 -0000	1.12
+++ .cvsignore	12 Mar 2006 21:09:15 -0000	1.13
@@ -9,7 +9,6 @@ gaim
 gaim.def
 gaim.lib
 gaim.dll
-gaim.service
 gaim-client-bindings.*
 gaim-client-example
 .*.swp

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/src/Makefile.am,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -p -r1.237 -r1.238
--- Makefile.am	26 Feb 2006 17:45:44 -0000	1.237
+++ Makefile.am	12 Mar 2006 21:09:16 -0000	1.238
@@ -157,8 +157,6 @@ gaim_coreheaders = \
 	xmlnode.h \
 	whiteboard.h
 
-
-
 if ENABLE_DBUS
 
 CLEANFILES = \
@@ -208,7 +206,6 @@ gaim-client-bindings.h: dbus-analyze-typ
 
 $(libgaim_client_la_OBJECTS): gaim-client-bindings.h gaim-client-bindings.c
 
-
 # gaim-client-example
 
 gaim_client_example_SOURCES = gaim-client-example.c
@@ -229,19 +226,6 @@ gaim-client-example.$(OBJEXT): gaim-clie
 
 bin_SCRIPTS = gaim-remote.py gaim-notifications-example.py gaim-send gaim-send-async
 
-
-# gaim.service
-
-gaim.service:
-	echo "[Gaim]" > $@
-	echo "Name=net.sf.gaim.GaimService" >> $@
-	echo "Exec=$(bindir)/gaim" >> $@
-
-#Ideally, this directory should be autodetected, and the user should
-#be able to specify it as an option to "configure"
-dbus_sessiondir = $(DBUS_SESSION_DIR)
-dbus_session_DATA = gaim.service
-
 endif
 
 bin_PROGRAMS = gaim $(gaim_clientbP)