diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-07-14 19:22:54 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-07-14 19:22:54 +0000 |
| commit | eb023508ad933fba5a5542ce2927d784a9c982a2 (patch) | |
| tree | e1e26264f7be2bab3d5e76274b55810ae20901dd /gmodule | |
| parent | f4e591eb7b9df60576646d873fc9dbac1bb1278a (diff) | |
Move glib-config to glib-config-2.0 move glib.m4 to glib-2.0.m4
Fri Jul 14 12:22:49 2000 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.am glib-config.m4 glib.m4: Move
glib-config to glib-config-2.0 move glib.m4 to
glib-2.0.m4
* Makefile.am gobject/Makefile.am gmodule/Makefile.am
gthread/Makefile.am tests/Makefile.am: Change
library names to libglib-1.3.la, etc, so that we
can distinguish glib-1.2 and glib-2.0 on the linkline.
* Makefile.am gobject/Makefile.am gmodule/Makefile.am:
Move include files into /usr/include/glib-2.0.
Thu Jul 6 18:54:49 2000 Owen Taylor <otaylor@redhat.com>
* docs/Makefile.am (EXTRA_DIST): Remove info files
from the build.
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/Makefile.am | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index e4d3b38d4..4ac2ea1e7 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -20,23 +20,23 @@ EXTRA_DIST = \ BUILT_SOURCES = gmoduleconf.h gmoduleconf.h: gmoduleconf.h.in -include_HEADERS = \ +glibincludedir=$(includedir)/glib-2.0 +glibinclude_HEADERS = \ gmodule.h -libglib = $(top_builddir)/libglib.la # -lglib +libglib = $(top_builddir)/libglib-1.3.la # -lglib top_builddir_full=`cd \$(top_builddir); pwd` -lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la +lib_LTLIBRARIES = libgmodule-1.3.la libgplugin_a.la libgplugin_b.la -libgmodule_la_SOURCES = gmodule.c -libgmodule_la_LDFLAGS = \ +libgmodule_1_3_la_SOURCES = gmodule.c +libgmodule_1_3_la_LDFLAGS = \ @G_MODULE_LDFLAGS@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) \ -export-dynamic -libgmodule_la_LIBADD = @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ # $(libglib) +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 ;( @@ -50,7 +50,7 @@ libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_ noinst_PROGRAMS = testgmodule testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@ -testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@ +testgmodule_LDADD = libgmodule-1.3.la $(libglib) @G_MODULE_LIBS@ gmodule.rc: $(top_builddir)/config.status $(top_srcdir)/gmodule/gmodule.rc.in cd $(top_builddir) && CONFIG_FILES=gmodule/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -65,10 +65,10 @@ files: echo $$p; \ done -install-libLTLIBRARIES: libgmodule.la +install-libLTLIBRARIES: libgmodule-1.3.la @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libdir) - @list='libgmodule.la'; for p in $$list; do \ + @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; \ |