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
|
--- Makefile.in.orig Thu Mar 15 10:48:50 2001
+++ Makefile.in Wed Nov 20 14:39:44 2002
@@ -37,7 +37,7 @@
DESTDIR =
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(prefix)/libdata/pkgconfig
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
@@ -96,9 +96,9 @@
AUTOMAKE_OPTIONS = 1.4
-SUBDIRS = . gmodule gthread docs tests
+SUBDIRS = . gmodule gthread docs
-configincludedir = $(pkglibdir)/include
+configincludedir = $(includedir)
bin_SCRIPTS = glib-config
@@ -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
@@ -134,7 +134,7 @@
m4datadir = $(datadir)/aclocal
m4data_DATA = glib.m4
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(pkglibdir)
pkgconfig_DATA = glib.pc gmodule.pc gthread.pc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -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
@@ -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:
--- 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
|
