diff options
| author | Tor Lillqvist <tml@iki.fi> | 2001-03-10 20:03:53 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2001-03-10 20:03:53 +0000 |
| commit | 8f69a82ccba8bb23ece458d9e6bc7f8948f5a533 (patch) | |
| tree | a59647388ac053a3ebb60fe93961f29ae63fea4c /gmodule | |
| parent | c54732d0ea603027bfdf5325d365b7e07829c332 (diff) | |
Use the _LIBADD dependencies on libglib only on Win32.
2001-03-10 Tor Lillqvist <tml@iki.fi>
* */Makefile.am: Use the _LIBADD dependencies on libglib only on
Win32.
* gobject/gobject.def: Add a couple of missing entries.
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/ChangeLog | 5 | ||||
| -rw-r--r-- | gmodule/Makefile.am | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index bd8021e12..2404ec138 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,8 @@ +2001-03-10 Tor Lillqvist <tml@iki.fi> + + * Makefile.am: Use the _LIBADD dependency on libglib only on the + Win32 platform (including Cygwin). + 2001-03-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * Makefile.am, makefile.mingw.in, makefile.msc.in: Set diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index 19ad51d59..b724fae25 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -35,6 +35,7 @@ top_builddir_full=`cd \$(top_builddir); pwd` lib_LTLIBRARIES = libgmodule-1.3.la libgplugin_a.la libgplugin_b.la if PLATFORM_WIN32 +libadd_libglib = $(libglib) no_undefined = -no-undefined endif if OS_WIN32 @@ -47,17 +48,15 @@ libgmodule_1_3_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -export-dynamic $(no_undefined) $(export_symbols) -libgmodule_1_3_la_LIBADD = @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ $(libglib) -# we should really depend on $(libglib) for libgmodule.la, but libtool has a -# problem with this ;( Ummm? Does it? +libgmodule_1_3_la_LIBADD = @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ $(libadd_libglib) libgplugin_a_la_SOURCES = libgplugin_a.c libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) -libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ libgmodule-1.3.la $(libglib) +libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ libgmodule-1.3.la $(libadd_libglib) libgplugin_b_la_SOURCES = libgplugin_b.c libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) -libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ libgmodule-1.3.la $(libglib) +libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ libgmodule-1.3.la $(libadd_libglib) noinst_PROGRAMS = testgmodule testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@ |