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
|
--- Makefile.in.orig Thu Mar 15 09:48:50 2001
+++ Makefile.in Mon May 21 21:23:16 2001
@@ -39,3 +39,3 @@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(prefix)/libdata/pkgconfig
pkgincludedir = $(includedir)/@PACKAGE@
@@ -98,7 +98,7 @@
-SUBDIRS = . gmodule gthread docs tests
+SUBDIRS = . gmodule gthread docs
-configincludedir = $(pkglibdir)/include
+configincludedir = $(includedir)
-bin_SCRIPTS = glib-config
+bin_SCRIPTS = glib@LT_RELEASE@-config
@@ -116,3 +116,3 @@
-glibincludedir = $(includedir)/glib-1.2
+glibincludedir = $(includedir)
glibinclude_HEADERS = glib.h
@@ -136,3 +136,3 @@
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(pkglibdir)
pkgconfig_DATA = glib.pc gmodule.pc gthread.pc
@@ -141,3 +141,3 @@
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
@@ -242,3 +242,3 @@
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
@@ -576,3 +576,3 @@
done
- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
+
garray.lo garray.o : garray.c glib.h glibconfig.h
@@ -631,3 +631,3 @@
uninstall: uninstall-recursive
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
$(HEADERS) config.h
@@ -710,3 +710,5 @@
-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
--- 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
|
