luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move glib-config to glib-config-2.0 move glib.m4 to glib-2.0.m4

Browse Source 
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.
This commit is contained in:
Owen Taylor
2000-07-14 19:22:54 +00:00
committed by Owen Taylor
parent f4e591eb7b
commit eb023508ad
19 changed files with 463 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gmodule/Makefile.am
View File

@@ -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; \