Put a list of the platform-dependent .la files in the subdirectories in

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.


svn path=/trunk/; revision=7336
This commit is contained in:
Tor Lillqvist 2008-08-11 12:35:09 +00:00 committed by Tor Lillqvist
parent c7ba2969d1
commit 3c9cfe7fb5
2 changed files with 13 additions and 1 deletions

View File

@ -1,3 +1,10 @@
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.
2008-08-11 Tor Lillqvist <tml@novell.com> 2008-08-11 Tor Lillqvist <tml@novell.com>
* Makefile.am (platform_libadd): Remove -lwininet which had been * Makefile.am (platform_libadd): Remove -lwininet which had been

View File

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