glib r7336 - trunk/gio

[tml svn gnome org]

Author: tml
Date: Mon Aug 11 12:35:09 2008
New Revision: 7336
URL: http://svn.gnome.org/viewvc/glib?rev=7336&view=rev

Log:
2008-08-11  Tor Lillqvist  <tml novell com>

	* Makefile.am: Put a list of the platform-dependent .la files in
	the subdirectories in the platform_deps Make variable, and make
	libgio-2.0.la depend on that, so that it gets relinked if one of
	the dependent libraries has changed.



Modified:
   trunk/gio/ChangeLog
   trunk/gio/Makefile.am

Modified: trunk/gio/Makefile.am
==============================================================================
--- trunk/gio/Makefile.am	(original)
+++ trunk/gio/Makefile.am	Mon Aug 11 12:35:09 2008
@@ -94,22 +94,26 @@
 	$(NULL)
 
 platform_libadd =
+platform_deps =
 appinfo_sources =
 
 if HAVE_INOTIFY
 SUBDIRS += inotify
 platform_libadd += inotify/libinotify.la
+platform_deps += inotify/libinotify.la
 endif
 
 if HAVE_FEN
 AM_CPPFLAGS += -DHAVE_FEN
 SUBDIRS += fen
 platform_libadd += fen/libfen.la
+platform_deps += fen/libfen.la
 endif
 
 if OS_WIN32
 SUBDIRS += win32
 platform_libadd += win32/libgiowin32.la
+platform_deps += win32/libgiowin32.la
 endif
 
 
@@ -122,6 +126,7 @@
 if OS_UNIX
 appinfo_sources += gdesktopappinfo.c gdesktopappinfo.h
 platform_libadd += xdgmime/libxdgmime.la
+platform_deps += xdgmime/libxdgmime.la
 unix_sources = \
 	gunixmount.c		\
 	gunixmount.h		\
@@ -267,7 +272,7 @@
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	-export-dynamic $(no_undefined) $(export_symbols)
 
-libgio_2_0_la_DEPENDENCIES = $(gio_def)
+libgio_2_0_la_DEPENDENCIES = $(gio_def) $(platform_deps)
 
 gio_headers =			\
 	gappinfo.h 		\