1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
--- Makefile.in.orig Tue May 11 05:06:36 1999
+++ Makefile.in Mon May 17 22:28:24 1999
@@ -95,11 +95,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 = glib@LT_RELEASE@-config
BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
@@ -132,7 +132,7 @@
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = glib.spec glib-config
+CONFIG_CLEAN_FILES = glib.spec glib@LT_RELEASE@-config
LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -232,7 +232,7 @@
maintainer-clean-hdr:
glib.spec: $(top_builddir)/config.status glib.spec.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-glib-config: $(top_builddir)/config.status glib-config.in
+glib@LT_RELEASE@-config: $(top_builddir)/config.status glib@LT_RELEASE@-config.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
mostlyclean-libLTLIBRARIES:
@@ -541,7 +541,6 @@
|| exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
info-am:
info: info-recursive
@@ -568,7 +567,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:
@@ -646,7 +645,8 @@
installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-glib-config: glib-config.in
+glib@LT_RELEASE@-config.in: glib-config.in
+ cp glib-config.in glib@LT_RELEASE@-config.in
configure: configure.in acglib.m4
glibconfig.h: stamp-gc-h
--- gmodule/Makefile.in.orig Tue May 11 05:06:37 1999
+++ gmodule/Makefile.in Mon May 17 22:28:24 1999
@@ -333,7 +333,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
--- gthread/Makefile.in.orig Tue May 11 05:06:39 1999
+++ gthread/Makefile.in Mon May 17 22:28:24 1999
@@ -128,7 +128,7 @@
testgthread_OBJECTS = testgthread.o
testgthread_DEPENDENCIES = ../libglib.la libgthread.la
testgthread_LDFLAGS =
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @G_THREAD_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)
@@ -297,7 +297,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
--- docs/Makefile.in.orig Tue May 11 05:06:40 1999
+++ docs/Makefile.in Mon May 17 22:28:24 1999
@@ -95,9 +95,9 @@
info_TEXINFOS = glib.texi
-man_MANS = glib-config.1
+man_MANS = glib@LT_RELEASE@-config.1
-EXTRA_DIST = glib-config.1.in glib.html glib_toc.html
+EXTRA_DIST = glib@LT_RELEASE@-config.1.in glib.html glib_toc.html
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
@@ -133,6 +133,8 @@
glib.info: glib.texi
glib.dvi: glib.texi
+glib@LT_RELEASE@-config.1: glib-config.1
+ cp glib-config.1 glib@LT_RELEASE@-config.1
DVIPS = dvips
|
