1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-31 21:57:12 +00:00
freebsd-ports/devel/glib12/files/patch-ab
1998-12-26 19:17:44 +00:00

404 lines
14 KiB
Plaintext

--- Makefile.in.orig Thu Dec 17 13:11:36 1998
+++ Makefile.in Sat Dec 26 22:58:19 1998
@@ -87,14 +87,12 @@
RANLIB = @RANLIB@
VERSION = @VERSION@
-SUBDIRS = gmodule gthread docs
+SUBDIRS = gmodule gthread
# alpha `automake' supports this better
#SUBDIRS = . gmodule docs
-configincludedir = $(pkglibdir)/include
-
-bin_SCRIPTS=glib-config
-BUILT_SOURCES=glib-config
+bin_SCRIPTS=glib11d-config
+BUILT_SOURCES=glib11d-config
INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
@@ -108,9 +106,9 @@
makefile.msc \
glibconfig.h.win32
-lib_LTLIBRARIES = libglib.la
+lib_LTLIBRARIES = libglib11d.la
-libglib_la_SOURCES = \
+libglib11d_la_SOURCES = \
garray.c \
gcache.c \
gcompletion.c \
@@ -138,27 +136,25 @@
gmutex.c
include_HEADERS = \
- glib.h
-
-configinclude_DATA = \
+ glib.h \
glibconfig.h
BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
-libglib_la_LDFLAGS = \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
+libglib11d_la_LDFLAGS = \
+ -version-info 1: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)
@@ -166,8 +162,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 glist.lo gmain.lo giochannel.lo \
giounix.lo gmem.lo gmessages.lo gnode.lo gprimes.lo gslist.lo gtimer.lo \
gtree.lo grel.lo gstring.lo gstrfuncs.lo gscanner.lo gutils.lo \
@@ -176,15 +172,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)
@@ -192,7 +188,7 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-DATA = $(configinclude_DATA) $(m4data_DATA)
+DATA = $(m4data_DATA)
HEADERS = $(include_HEADERS)
@@ -206,8 +202,8 @@
TAR = tar
GZIP = --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-recursive-am all-am
@@ -248,7 +244,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= ./config.status
mostlyclean-libLTLIBRARIES:
@@ -314,8 +313,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:
@@ -357,44 +356,6 @@
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
done
-install-configincludeDATA: $(configinclude_DATA)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(configincludedir)
- @list='$(configinclude_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configincludedir)/$$p"; \
- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configincludedir)/$$p; \
- else if test -f $$p; then \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(configincludedir)/$$p"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(configincludedir)/$$p; \
- fi; fi; \
- done
-
-uninstall-configincludeDATA:
- @$(NORMAL_UNINSTALL)
- list='$(configinclude_DATA)'; for p in $$list; do \
- rm -f $(DESTDIR)$(configincludedir)/$$p; \
- done
-
-install-m4dataDATA: $(m4data_DATA)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(m4datadir)
- @list='$(m4data_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p"; \
- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p; \
- else if test -f $$p; then \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p; \
- fi; fi; \
- done
-
-uninstall-m4dataDATA:
- @$(NORMAL_UNINSTALL)
- list='$(m4data_DATA)'; for p in $$list; do \
- rm -f $(DESTDIR)$(m4datadir)/$$p; \
- done
-
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(includedir)
@@ -534,13 +495,13 @@
all-recursive-am: config.h
$(MAKE) all-recursive
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) config.h
+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(HEADERS) config.h
install-exec-am: install-libLTLIBRARIES install-binSCRIPTS
-install-data-am: install-configincludeDATA install-m4dataDATA install-includeHEADERS
+install-data-am: install-includeHEADERS
-uninstall-am: uninstall-libLTLIBRARIES uninstall-binSCRIPTS uninstall-configincludeDATA uninstall-m4dataDATA uninstall-includeHEADERS
+uninstall-am: uninstall-libLTLIBRARIES uninstall-binSCRIPTS uninstall-includeHEADERS
install-exec: install-exec-recursive install-exec-am
@$(NORMAL_INSTALL)
@@ -616,8 +577,7 @@
maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
distclean-noinstPROGRAMS clean-noinstPROGRAMS \
maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
-uninstall-configincludeDATA install-configincludeDATA \
-uninstall-m4dataDATA install-m4dataDATA uninstall-includeHEADERS \
+uninstall-includeHEADERS \
install-includeHEADERS install-data-recursive uninstall-data-recursive \
install-exec-recursive uninstall-exec-recursive installdirs-recursive \
uninstalldirs-recursive all-recursive check-recursive \
--- gmodule/Makefile.in.orig Thu Dec 17 13:11:37 1998
+++ gmodule/Makefile.in Sat Dec 26 22:51:58 1998
@@ -101,30 +101,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 = \
+libgmodule11d_la_SOURCES = gmodule.c
+libgmodule11d_la_LDFLAGS = \
@G_MODULE_LDFLAGS@ \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE)
+ -version-info 1: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_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
@@ -135,17 +134,17 @@
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
testgmodule_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -161,10 +160,10 @@
TAR = tar
GZIP = --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: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+all: Makefile $(LTLIBRARIES) $(HEADERS)
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
@@ -231,14 +230,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:
@@ -386,10 +385,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 Dec 17 13:11:39 1998
+++ gthread/Makefile.in Sat Dec 26 22:51:58 1998
@@ -93,19 +93,18 @@
gthread-nspr.c \
gthread-none.c
-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 1: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 =
@@ -116,13 +115,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) $(CPPFLAGS) $(CFLAGS)
@@ -135,10 +134,10 @@
TAR = tar
GZIP = --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: Makefile $(LTLIBRARIES) $(PROGRAMS)
+all: Makefile $(LTLIBRARIES)
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
@@ -213,8 +212,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: