diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-05-16 18:35:39 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-05-16 18:35:39 +0000 |
| commit | 33888fc0c841d6df20e2fb522e80e032073d9acd (patch) | |
| tree | 9b0f4242e13edb7b5d0df0160c911f8b01bcbd71 /gmodule | |
| parent | 348c8f102f9b742aa74c2e4f1b6e67f87b084b6c (diff) | |
Add inter-library dependencies.
Sun May 13 10:31:17 2001 Owen Taylor <otaylor@redhat.com>
* glib/Makefile.am gobject/Makefile.am gmodule/Makefile.am:
Add inter-library dependencies.
* acinclude.m4: Remove libtool macros.
* autogen.sh: Require libtool-1.4, automake-1.4p1.
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/Makefile.am | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index a6838b96e..95f43d250 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -32,11 +32,10 @@ libglib = $(top_builddir)/libglib-1.3.la top_builddir_full=`cd \$(top_builddir); pwd` -lib_LTLIBRARIES = libgmodule-1.3.la libgplugin_a.la libgplugin_b.la +lib_LTLIBRARIES = libgmodule-1.3.la +noinst_LTLIBRARIES = libgplugin_a.la libgplugin_b.la if PLATFORM_WIN32 -libadd_libglib = $(libglib) -libadd_libgmodule = libgmodule-1.3.la no_undefined = -no-undefined endif if OS_WIN32 @@ -49,15 +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@ $(libadd_libglib) +libgmodule_1_3_la_LIBADD = @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ $(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@ $(libadd_libgmodule) $(libadd_libglib) +libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ libgmodule-1.3.la $(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@ $(libadd_libgmodule) $(libadd_libglib) +libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ libgmodule-1.3.la $(libglib) noinst_PROGRAMS = testgmodule testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@ @@ -79,16 +78,6 @@ files: echo $$p; \ done -install-libLTLIBRARIES: libgmodule-1.3.la - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libdir) - @list='libgmodule-1.3.la'; for p in $$list; do \ - if test -f $$p; then \ - echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \ - else :; fi; \ - done - release: $(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"` |