334 lines
13 KiB
Plaintext
334 lines
13 KiB
Plaintext
--- Makefile.in.orig Thu Jan 28 22:53:35 1999
|
|
+++ Makefile.in Thu Jan 28 22:59:44 1999
|
|
@@ -89,11 +89,11 @@
|
|
|
|
AUTOMAKE_OPTIONS = 1.4
|
|
|
|
-SUBDIRS = . gmodule gthread docs tests
|
|
+SUBDIRS = . gmodule gthread docs
|
|
|
|
-configincludedir = $(pkglibdir)/include
|
|
+configincludedir = $(includedir)
|
|
|
|
-bin_SCRIPTS = glib-config
|
|
+bin_SCRIPTS = glib11d-config
|
|
|
|
BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
|
|
|
|
@@ -102,9 +102,9 @@
|
|
EXTRA_DIST = glib.m4 glib.spec acglib.m4 sanity_check README.win32 glib.def makefile.msc giowin32.c glibconfig.h.win32 config.h.win32
|
|
|
|
|
|
-lib_LTLIBRARIES = libglib.la
|
|
+lib_LTLIBRARIES = libglib11d.la
|
|
|
|
-libglib_la_SOURCES = garray.c gcache.c gcompletion.c gdataset.c gdate.c gerror.c ghash.c ghook.c giochannel.c giounix.c glist.c gmain.c gmem.c gmessages.c gmutex.c gnode.c gprimes.c grel.c gscanner.c gslist.c gstrfuncs.c gstring.c gtimer.c gtree.c gutils.c
|
|
+libglib11d_la_SOURCES = garray.c gcache.c gcompletion.c gdataset.c gdate.c gerror.c ghash.c ghook.c giochannel.c giounix.c glist.c gmain.c gmem.c gmessages.c gmutex.c gnode.c gprimes.c grel.c gscanner.c gslist.c gstrfuncs.c gstring.c gtimer.c gtree.c gutils.c
|
|
|
|
|
|
include_HEADERS = glib.h
|
|
@@ -113,20 +113,20 @@
|
|
configinclude_DATA = glibconfig.h
|
|
|
|
|
|
-libglib_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
|
|
+libglib11d_la_LDFLAGS = -version-info 2:1:0
|
|
|
|
|
|
noinst_PROGRAMS = testglib testgdate testgdateparser
|
|
-testglib_LDADD = libglib.la
|
|
-testgdate_LDADD = libglib.la
|
|
-testgdateparser_LDADD = libglib.la
|
|
+testglib_LDADD = libglib11d.la
|
|
+testgdate_LDADD = libglib11d.la
|
|
+testgdateparser_LDADD = libglib11d.la
|
|
|
|
m4datadir = $(datadir)/aclocal
|
|
m4data_DATA = glib.m4
|
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = config.h
|
|
-CONFIG_CLEAN_FILES = glib-config
|
|
+CONFIG_CLEAN_FILES = glib11d-config
|
|
LTLIBRARIES = $(lib_LTLIBRARIES)
|
|
|
|
|
|
@@ -134,8 +134,8 @@
|
|
CPPFLAGS = @CPPFLAGS@
|
|
LDFLAGS = @LDFLAGS@
|
|
LIBS = @LIBS@
|
|
-libglib_la_LIBADD =
|
|
-libglib_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \
|
|
+libglib11d_la_LIBADD =
|
|
+libglib11d_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \
|
|
gdate.lo gerror.lo ghash.lo ghook.lo giochannel.lo giounix.lo glist.lo \
|
|
gmain.lo gmem.lo gmessages.lo gmutex.lo gnode.lo gprimes.lo grel.lo \
|
|
gscanner.lo gslist.lo gstrfuncs.lo gstring.lo gtimer.lo gtree.lo \
|
|
@@ -144,15 +144,15 @@
|
|
|
|
testglib_SOURCES = testglib.c
|
|
testglib_OBJECTS = testglib.o
|
|
-testglib_DEPENDENCIES = libglib.la
|
|
+testglib_DEPENDENCIES = libglib11d.la
|
|
testglib_LDFLAGS =
|
|
testgdate_SOURCES = testgdate.c
|
|
testgdate_OBJECTS = testgdate.o
|
|
-testgdate_DEPENDENCIES = libglib.la
|
|
+testgdate_DEPENDENCIES = libglib11d.la
|
|
testgdate_LDFLAGS =
|
|
testgdateparser_SOURCES = testgdateparser.c
|
|
testgdateparser_OBJECTS = testgdateparser.o
|
|
-testgdateparser_DEPENDENCIES = libglib.la
|
|
+testgdateparser_DEPENDENCIES = libglib11d.la
|
|
testgdateparser_LDFLAGS =
|
|
SCRIPTS = $(bin_SCRIPTS)
|
|
|
|
@@ -175,8 +175,8 @@
|
|
|
|
TAR = tar
|
|
GZIP_ENV = --best
|
|
-SOURCES = $(libglib_la_SOURCES) testglib.c testgdate.c testgdateparser.c
|
|
-OBJECTS = $(libglib_la_OBJECTS) testglib.o testgdate.o testgdateparser.o
|
|
+SOURCES = $(libglib11d_la_SOURCES) testglib.c testgdate.c testgdateparser.c
|
|
+OBJECTS = $(libglib11d_la_OBJECTS) testglib.o testgdate.o testgdateparser.o
|
|
|
|
all: all-redirect
|
|
.SUFFIXES:
|
|
@@ -223,7 +223,10 @@
|
|
-rm -f config.h
|
|
|
|
maintainer-clean-hdr:
|
|
-glib-config: $(top_builddir)/config.status glib-config.in
|
|
+glib11d-config.in: glib-config.in
|
|
+ cp glib-config.in glib11d-config.in
|
|
+
|
|
+glib11d-config: $(top_builddir)/config.status glib11d-config.in
|
|
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
|
|
|
mostlyclean-libLTLIBRARIES:
|
|
@@ -289,8 +292,8 @@
|
|
|
|
maintainer-clean-libtool:
|
|
|
|
-libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES)
|
|
- $(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS)
|
|
+libglib11d.la: $(libglib11d_la_OBJECTS) $(libglib11d_la_DEPENDENCIES)
|
|
+ $(LINK) -rpath $(libdir) $(libglib11d_la_LDFLAGS) $(libglib11d_la_OBJECTS) $(libglib11d_la_LIBADD) $(LIBS)
|
|
|
|
mostlyclean-noinstPROGRAMS:
|
|
|
|
@@ -558,7 +561,7 @@
|
|
uninstall-configincludeDATA uninstall-m4dataDATA \
|
|
uninstall-includeHEADERS
|
|
uninstall: uninstall-recursive
|
|
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
|
|
+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
|
|
$(HEADERS) config.h
|
|
all-redirect: all-recursive-am
|
|
install-strip:
|
|
--- gmodule/Makefile.in.orig Thu Jan 28 23:01:00 1999
|
|
+++ gmodule/Makefile.in Thu Jan 28 23:06:56 1999
|
|
@@ -98,29 +98,29 @@
|
|
include_HEADERS = gmodule.h
|
|
|
|
|
|
-libglib = $(top_builddir)/libglib.la # -lglib
|
|
+libglib = $(top_builddir)/libglib11d.la # -lglib
|
|
|
|
-lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la
|
|
+lib_LTLIBRARIES = libgmodule11d.la libgplugin11d_a.la libgplugin11d_b.la
|
|
|
|
-libgmodule_la_SOURCES = gmodule.c
|
|
-libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
|
|
+libgmodule11d_la_SOURCES = gmodule.c
|
|
+libgmodule11d_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 2:1:0
|
|
|
|
|
|
-libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
|
|
+libgmodule11d_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
|
|
# we should really depend on $(libglib) for libgmodule.la, but libtool has a
|
|
# problem with this ;(
|
|
|
|
-libgplugin_a_la_SOURCES = libgplugin_a.c
|
|
-libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@
|
|
-libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
|
|
-
|
|
-libgplugin_b_la_SOURCES = libgplugin_b.c
|
|
-libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@
|
|
-libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
|
|
+libgplugin11d_a_la_SOURCES = libgplugin_a.c
|
|
+libgplugin11d_a_la_LDFLAGS = @G_MODULE_LDFLAGS@
|
|
+libgplugin11d_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
|
|
+
|
|
+libgplugin11d_b_la_SOURCES = libgplugin_b.c
|
|
+libgplugin11d_b_la_LDFLAGS = @G_MODULE_LDFLAGS@
|
|
+libgplugin11d_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
|
|
|
|
noinst_PROGRAMS = testgmodule
|
|
testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
|
|
-testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
|
|
+testgmodule_LDADD = libgmodule11d.la $(libglib) @G_MODULE_LIBS@
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = ../config.h
|
|
CONFIG_CLEAN_FILES = gmoduleconf.h
|
|
@@ -131,22 +131,22 @@
|
|
CPPFLAGS = @CPPFLAGS@
|
|
LDFLAGS = @LDFLAGS@
|
|
LIBS = @LIBS@
|
|
-libgmodule_la_DEPENDENCIES =
|
|
-libgmodule_la_OBJECTS = gmodule.lo
|
|
-libgplugin_a_la_DEPENDENCIES =
|
|
-libgplugin_a_la_OBJECTS = libgplugin_a.lo
|
|
-libgplugin_b_la_DEPENDENCIES =
|
|
-libgplugin_b_la_OBJECTS = libgplugin_b.lo
|
|
+libgmodule11d_la_DEPENDENCIES =
|
|
+libgmodule11d_la_OBJECTS = gmodule.lo
|
|
+libgplugin11d_a_la_DEPENDENCIES =
|
|
+libgplugin11d_a_la_OBJECTS = libgplugin_a.lo
|
|
+libgplugin11d_b_la_DEPENDENCIES =
|
|
+libgplugin11d_b_la_OBJECTS = libgplugin_b.lo
|
|
PROGRAMS = $(noinst_PROGRAMS)
|
|
|
|
testgmodule_SOURCES = testgmodule.c
|
|
testgmodule_OBJECTS = testgmodule.o
|
|
-testgmodule_DEPENDENCIES = libgmodule.la $(top_builddir)/libglib.la
|
|
+testgmodule_DEPENDENCIES = libgmodule11d.la $(top_builddir)/libglib11d.la
|
|
CFLAGS = @CFLAGS@
|
|
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
CCLD = $(CC)
|
|
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
|
+LINK = $(LIBTOOL) --mode=link $(CCLD) -export-dynamic $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
|
HEADERS = $(include_HEADERS)
|
|
|
|
DIST_COMMON = AUTHORS COPYING ChangeLog Makefile.am Makefile.in \
|
|
@@ -157,8 +157,8 @@
|
|
|
|
TAR = tar
|
|
GZIP_ENV = --best
|
|
-SOURCES = $(libgmodule_la_SOURCES) $(libgplugin_a_la_SOURCES) $(libgplugin_b_la_SOURCES) testgmodule.c
|
|
-OBJECTS = $(libgmodule_la_OBJECTS) $(libgplugin_a_la_OBJECTS) $(libgplugin_b_la_OBJECTS) testgmodule.o
|
|
+SOURCES = $(libgmodule11d_la_SOURCES) $(libgplugin11d_a_la_SOURCES) $(libgplugin11d_b_la_SOURCES) testgmodule.c
|
|
+OBJECTS = $(libgmodule11d_la_OBJECTS) $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_b_la_OBJECTS) testgmodule.o
|
|
|
|
all: all-redirect
|
|
.SUFFIXES:
|
|
@@ -226,14 +226,14 @@
|
|
|
|
maintainer-clean-libtool:
|
|
|
|
-libgmodule.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES)
|
|
- $(LINK) -rpath $(libdir) $(libgmodule_la_LDFLAGS) $(libgmodule_la_OBJECTS) $(libgmodule_la_LIBADD) $(LIBS)
|
|
+libgmodule11d.la: $(libgmodule11d_la_OBJECTS) $(libgmodule11d_la_DEPENDENCIES)
|
|
+ $(LINK) -rpath $(libdir) $(libgmodule11d_la_LDFLAGS) $(libgmodule11d_la_OBJECTS) $(libgmodule11d_la_LIBADD) $(LIBS)
|
|
|
|
-libgplugin_a.la: $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_DEPENDENCIES)
|
|
- $(LINK) -rpath $(libdir) $(libgplugin_a_la_LDFLAGS) $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_LIBADD) $(LIBS)
|
|
+libgplugin11d_a.la: $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_a_la_DEPENDENCIES)
|
|
+ $(LINK) -rpath $(libdir) $(libgplugin11d_a_la_LDFLAGS) $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_a_la_LIBADD) $(LIBS)
|
|
|
|
-libgplugin_b.la: $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_DEPENDENCIES)
|
|
- $(LINK) -rpath $(libdir) $(libgplugin_b_la_LDFLAGS) $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_LIBADD) $(LIBS)
|
|
+libgplugin11d_b.la: $(libgplugin11d_b_la_OBJECTS) $(libgplugin11d_b_la_DEPENDENCIES)
|
|
+ $(LINK) -rpath $(libdir) $(libgplugin11d_b_la_LDFLAGS) $(libgplugin11d_b_la_OBJECTS) $(libgplugin11d_b_la_LIBADD) $(LIBS)
|
|
|
|
mostlyclean-noinstPROGRAMS:
|
|
|
|
@@ -327,7 +327,7 @@
|
|
install: install-am
|
|
uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS
|
|
uninstall: uninstall-am
|
|
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
|
|
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
|
|
all-redirect: all-am
|
|
install-strip:
|
|
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
|
|
@@ -398,10 +398,10 @@
|
|
echo $$p; \
|
|
done
|
|
|
|
-install-libLTLIBRARIES: libgmodule.la
|
|
+install-libLTLIBRARIES: libgmodule11d.la
|
|
@$(NORMAL_INSTALL)
|
|
$(mkinstalldirs) $(DESTDIR)$(libdir)
|
|
- @list='libgmodule.la'; for p in $$list; do \
|
|
+ @list='libgmodule11d.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; \
|
|
--- gthread/Makefile.in.orig Thu Jan 28 23:07:14 1999
|
|
+++ gthread/Makefile.in Thu Jan 28 23:09:35 1999
|
|
@@ -92,18 +92,18 @@
|
|
EXTRA_DIST = gthread-posix.c gthread-solaris.c gthread-nspr.c gthread-none.c gthread.def
|
|
|
|
|
|
-libglib = $(top_builddir)/libglib.la # -lglib
|
|
+libglib = $(top_builddir)/libglib11d.la # -lglib
|
|
|
|
-lib_LTLIBRARIES = libgthread.la
|
|
+lib_LTLIBRARIES = libgthread11d.la
|
|
|
|
-libgthread_la_SOURCES = gthread.c
|
|
-libgthread_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
|
|
+libgthread11d_la_SOURCES = gthread.c
|
|
+libgthread11d_la_LDFLAGS = -version-info 2:1:0
|
|
|
|
|
|
-libgthread_la_LIBADD = @G_THREAD_LIBS@
|
|
+libgthread11d_la_LIBADD = @G_THREAD_LIBS@
|
|
|
|
noinst_PROGRAMS = testgthread
|
|
-testgthread_LDADD = ../libglib.la libgthread.la
|
|
+testgthread_LDADD = ../libglib11d.la libgthread11d.la
|
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
CONFIG_HEADER = ../config.h
|
|
CONFIG_CLEAN_FILES =
|
|
@@ -114,13 +114,13 @@
|
|
CPPFLAGS = @CPPFLAGS@
|
|
LDFLAGS = @LDFLAGS@
|
|
LIBS = @LIBS@
|
|
-libgthread_la_DEPENDENCIES =
|
|
-libgthread_la_OBJECTS = gthread.lo
|
|
+libgthread11d_la_DEPENDENCIES =
|
|
+libgthread11d_la_OBJECTS = gthread.lo
|
|
PROGRAMS = $(noinst_PROGRAMS)
|
|
|
|
testgthread_SOURCES = testgthread.c
|
|
testgthread_OBJECTS = testgthread.o
|
|
-testgthread_DEPENDENCIES = ../libglib.la libgthread.la
|
|
+testgthread_DEPENDENCIES = ../libglib11d.la libgthread11d.la
|
|
testgthread_LDFLAGS =
|
|
CFLAGS = @CFLAGS@
|
|
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
@@ -134,8 +134,8 @@
|
|
|
|
TAR = tar
|
|
GZIP_ENV = --best
|
|
-SOURCES = $(libgthread_la_SOURCES) testgthread.c
|
|
-OBJECTS = $(libgthread_la_OBJECTS) testgthread.o
|
|
+SOURCES = $(libgthread11d_la_SOURCES) testgthread.c
|
|
+OBJECTS = $(libgthread11d_la_OBJECTS) testgthread.o
|
|
|
|
all: all-redirect
|
|
.SUFFIXES:
|
|
@@ -211,8 +211,8 @@
|
|
|
|
maintainer-clean-libtool:
|
|
|
|
-libgthread.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES)
|
|
- $(LINK) -rpath $(libdir) $(libgthread_la_LDFLAGS) $(libgthread_la_OBJECTS) $(libgthread_la_LIBADD) $(LIBS)
|
|
+libgthread11d.la: $(libgthread11d_la_OBJECTS) $(libgthread11d_la_DEPENDENCIES)
|
|
+ $(LINK) -rpath $(libdir) $(libgthread11d_la_LDFLAGS) $(libgthread11d_la_OBJECTS) $(libgthread11d_la_LIBADD) $(LIBS)
|
|
|
|
mostlyclean-noinstPROGRAMS:
|
|
|
|
@@ -291,7 +291,7 @@
|
|
install: install-am
|
|
uninstall-am: uninstall-libLTLIBRARIES
|
|
uninstall: uninstall-am
|
|
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
|
|
+all-am: Makefile $(LTLIBRARIES)
|
|
all-redirect: all-am
|
|
install-strip:
|
|
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
|