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
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
|
--- Makefile.in.orig Fri Mar 2 17:37:20 2001
+++ Makefile.in Tue Mar 6 09:26:01 2001
@@ -96,11 +96,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
@@ -114,7 +114,7 @@
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
-glibincludedir = $(includedir)/glib-1.2
+glibincludedir = $(includedir)
glibinclude_HEADERS = glib.h
@@ -139,7 +139,7 @@
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = glib.spec glib-config glib.pc gmodule.pc \
+CONFIG_CLEAN_FILES = glib.spec glib@LT_RELEASE@-config glib.pc gmodule.pc \
gthread.pc
LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -240,7 +240,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
glib.pc: $(top_builddir)/config.status glib.pc.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -574,7 +574,7 @@
|| exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
+
garray.lo garray.o : garray.c glib.h glibconfig.h
gcache.lo gcache.o : gcache.c glib.h glibconfig.h
gcompletion.lo gcompletion.o : gcompletion.c glib.h glibconfig.h
@@ -619,7 +619,7 @@
install-exec: install-exec-recursive
install-data-am: install-configincludeDATA install-m4dataDATA \
- install-pkgconfigDATA install-glibincludeHEADERS
+ install-glibincludeHEADERS
install-data: install-data-recursive
install-am: all-am
@@ -629,7 +629,7 @@
uninstall-configincludeDATA uninstall-m4dataDATA \
uninstall-pkgconfigDATA uninstall-glibincludeHEADERS
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:
@@ -708,7 +708,9 @@
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
+
glibconfig.h: stamp-gc-h
@:
stamp-gc-h: config.status
--- gmodule/Makefile.in.orig Fri Mar 2 17:37:21 2001
+++ gmodule/Makefile.in Tue Mar 6 09:24:01 2001
@@ -100,7 +100,7 @@
BUILT_SOURCES = gmoduleconf.h
-glibincludedir = $(includedir)/glib-1.2
+glibincludedir = $(includedir)
glibinclude_HEADERS = gmodule.h
@@ -341,7 +341,7 @@
install: install-am
uninstall-am: uninstall-libLTLIBRARIES uninstall-glibincludeHEADERS
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 Mar 6 09:12:20 2001
+++ gthread/Makefile.in Tue Mar 6 09:12:59 2001
@@ -127,7 +127,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)
@@ -300,7 +300,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 Mar 6 09:13:07 2001
+++ docs/Makefile.in Tue Mar 6 09:14:01 2001
@@ -94,9 +94,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
@@ -132,6 +132,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
|
