gnome-session r5165 - in trunk: . compat gnome-session splash

[vuntz svn gnome org]

Author: vuntz
Date: Wed Dec 10 06:38:00 2008
New Revision: 5165
URL: http://svn.gnome.org/viewvc/gnome-session?rev=5165&view=rev

Log:
2008-12-10  Vincent Untz  <vuntz gnome org>

	* configure.in:
	* compat/Makefile.am:
	* gnome-session/Makefile.am:
	* splash/Makefile.am: try to sanitize things a bit so we can know which
	part of gnome-session depends on which library


Modified:
   trunk/ChangeLog
   trunk/compat/Makefile.am
   trunk/configure.in
   trunk/gnome-session/Makefile.am
   trunk/splash/Makefile.am

Modified: trunk/compat/Makefile.am
==============================================================================
--- trunk/compat/Makefile.am	(original)
+++ trunk/compat/Makefile.am	Wed Dec 10 06:38:00 2008
@@ -1,17 +1,15 @@
 INCLUDES =					\
 	$(WARN_CFLAGS)				\
 	$(DISABLE_DEPRECATED_CFLAGS)		\
-	$(DBUS_GLIB_CFLAGS)			\
+	$(COMPAT_CFLAGS)			\
 	$(GCONF_CFLAGS)				\
-	$(GTK_CFLAGS)				\
 	-I$(top_srcdir)/egg			\
 	-DAT_SPI_REGISTRYD_DIR=\""$(AT_SPI_REGISTRYD_DIR)"\" \
 	-DDEFAULT_SESSION_DIR=\""$(default_sessiondir)"\" \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
 
 LDADD =						\
-	$(DBUS_GLIB_LIBS)			\
-	$(GTK_LIBS)
+	$(COMPAT_LIBS)
 
 helperdir = $(pkglibdir)/helpers
 helper_PROGRAMS =				\

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Dec 10 06:38:00 2008
@@ -66,15 +66,20 @@
 PKG_CHECK_MODULES(SESSION_PROPERTIES,
         glib-2.0 >= $GLIB_REQUIRED
         gtk+-2.0 >= $GTK_REQUIRED
-        libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
         libglade-2.0 >= $GLADE_REQUIRED
 )
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
+PKG_CHECK_MODULES(SPLASH,
+        dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+        libstartup-notification-1.0
+        libgnomeui-2.0)
+
+PKG_CHECK_MODULES(COMPAT,
+        gtk+-2.0 >= $GTK_REQUIRED
+        dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
+
 PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
 PKG_CHECK_MODULES(GCONF, gconf-2.0)
-PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
-PKG_CHECK_MODULES(STARTUP_NOTIFICATION, libstartup-notification-1.0)
 
 PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-2.0)
 PKG_CHECK_MODULES(EGG_LIBGNOMEUI, libgnomeui-2.0)

Modified: trunk/gnome-session/Makefile.am
==============================================================================
--- trunk/gnome-session/Makefile.am	(original)
+++ trunk/gnome-session/Makefile.am	Wed Dec 10 06:38:00 2008
@@ -13,9 +13,7 @@
 	$(WARN_CFLAGS)				\
 	$(DISABLE_DEPRECATED_CFLAGS)		\
 	$(GNOME_SESSION_CFLAGS)			\
-	$(DBUS_GLIB_CFLAGS)			\
 	$(GCONF_CFLAGS)				\
-	$(GTK_CFLAGS)				\
 	$(POLKIT_GNOME_CFLAGS)			\
 	-I$(top_srcdir)/egg			\
 	-DLOCALE_DIR=\""$(datadir)/locale"\"	\
@@ -32,7 +30,6 @@
 
 test_inhibit_LDADD =				\
 	$(GNOME_SESSION_LIBS)			\
-	$(DBUS_GLIB_LIBS)			\
 	$(NULL)
 
 test_client_dbus_SOURCES = 	\
@@ -40,7 +37,6 @@
 	$(NULL)
 
 test_client_dbus_LDADD =			\
-	$(DBUS_GLIB_LIBS)			\
 	$(NULL)
 
 gnome_session_LDADD =				\
@@ -48,7 +44,6 @@
 	libgsmutil.la 				\
 	$(top_builddir)/egg/libeggdesktopfile.la \
 	$(GNOME_SESSION_LIBS)			\
-	$(DBUS_GLIB_LIBS)			\
 	$(GCONF_LIBS)				\
 	$(POLKIT_GNOME_LIBS)			\
 	$(XRENDER_LIBS)

Modified: trunk/splash/Makefile.am
==============================================================================
--- trunk/splash/Makefile.am	(original)
+++ trunk/splash/Makefile.am	Wed Dec 10 06:38:00 2008
@@ -4,15 +4,13 @@
 	-I$(top_srcdir)/egg			\
 	$(WARN_CFLAGS)				\
 	$(DISABLE_DEPRECATED_CFLAGS)		\
-	$(DBUS_GLIB_CFLAGS)			\
 	$(GCONF_CFLAGS)				\
-	$(LIBGNOMEUI_CFLAGS)			\
-	$(STARTUP_NOTIFICATION_CFLAGS)
+	$(SPLASH_CFLAGS)
 
 LDADD =						\
 	$(top_builddir)/egg/libeggsmclient-gnome.la \
 	$(GCONF_LIBS)				\
-	$(LIBGNOMEUI_LIBS)
+	$(SPLASH_LIBS)
 
 helperdir = $(pkglibdir)/helpers
 helper_PROGRAMS =				\
@@ -29,8 +27,6 @@
 	splash-window.c				\
 	splash-window.h
 gnome_session_splash_LDADD =			\
-	$(STARTUP_NOTIFICATION_LIBS)		\
-	$(DBUS_GLIB_LIBS)			\
 	$(LDADD)
 
 @INTLTOOL_DESKTOP_RULE@