summaryrefslogtreecommitdiff
path: root/x11-toolkits/gtk12/files/patch-aa
blob: ce58674e8af7d5414765623805540dc759a90634 (plain) (blame)
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
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
--- Makefile.in.orig	Mon Jan 18 08:16:41 1999
+++ Makefile.in	Thu Jan 21 04:51:44 1999
@@ -122,7 +122,7 @@
 SRC_SUBDIRS = gdk gtk
 SUBDIRS = po $(SRC_SUBDIRS) docs
 
-bin_SCRIPTS = gtk-config
+bin_SCRIPTS = gtk11d-config
 
 EXTRA_DIST =	\
 	HACKING		\
@@ -209,7 +209,7 @@
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =  gtk-config
+CONFIG_CLEAN_FILES =  gtk11d-config
 SCRIPTS =  $(bin_SCRIPTS)
 
 DATA =  $(m4data_DATA)
@@ -263,7 +263,10 @@
 	-rm -f config.h
 
 maintainer-clean-hdr:
-gtk-config: $(top_builddir)/config.status gtk-config.in
+gtk11d-config.in: gtk-config.in
+	cp gtk-config.in gtk11d-config.in
+
+gtk11d-config: $(top_builddir)/config.status gtk11d-config.in
 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
 
 install-binSCRIPTS: $(bin_SCRIPTS)
@@ -285,25 +288,6 @@
 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
 	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
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -443,21 +427,19 @@
 all-recursive-am: config.h
 	$(MAKE) all-recursive
 
-all-am: Makefile $(SCRIPTS) $(DATA) config.h
+all-am: Makefile $(SCRIPTS) config.h
 
 install-exec-am: install-binSCRIPTS
 
-install-data-am: install-m4dataDATA
-
-uninstall-am: uninstall-binSCRIPTS uninstall-m4dataDATA
+uninstall-am: uninstall-binSCRIPTS
 
 install-exec: install-exec-recursive install-exec-am
 	@$(NORMAL_INSTALL)
 
-install-data: install-data-recursive install-data-am
+install-data: install-data-recursive
 	@$(NORMAL_INSTALL)
 
-install: install-recursive install-exec-am install-data-am
+install: install-recursive install-exec-am
 	@:
 
 uninstall: uninstall-recursive uninstall-am
@@ -505,15 +487,15 @@
 	-rm -f config.status
 
 .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-uninstall-binSCRIPTS install-binSCRIPTS uninstall-m4dataDATA \
-install-m4dataDATA install-data-recursive uninstall-data-recursive \
+uninstall-binSCRIPTS install-binSCRIPTS \
+install-data-recursive uninstall-data-recursive \
 install-exec-recursive uninstall-exec-recursive installdirs-recursive \
 uninstalldirs-recursive all-recursive check-recursive \
 installcheck-recursive info-recursive dvi-recursive \
 mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
-installcheck all-recursive-am all-am install-exec-am install-data-am \
+installcheck all-recursive-am all-am install-exec-am \
 uninstall-am install-exec install-data install uninstall all \
 installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
--- docs/Makefile.in.orig	Thu Jan 21 04:51:49 1999
+++ docs/Makefile.in	Thu Jan 21 04:52:04 1999
@@ -98,7 +98,7 @@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split
 MKINSTALLDIRS = @MKINSTALLDIRS@
 NM = @NM@
 PACKAGE = @PACKAGE@
--- gdk/Makefile.in.orig	Mon Jan 18 08:16:45 1999
+++ gdk/Makefile.in	Thu Jan 21 02:41:48 1999
@@ -121,7 +121,7 @@
 
 gdkincludedir = $(includedir)/gdk
 
-lib_LTLIBRARIES = libgdk.la
+lib_LTLIBRARIES = libgdk11d.la
 
 INCLUDES = \
 	-DG_LOG_DOMAIN=\"Gdk\"	\
@@ -132,7 +132,7 @@
 	@GLIB_CFLAGS@		\
 	@x_cflags@ 
 
-libgdk_la_SOURCES = \
+libgdk11d_la_SOURCES = \
 	gdk.c		\
 	gdkcc.c		\
 	gdkcolor.c	\
@@ -181,8 +181,8 @@
 	@GLIB_LIBS@	\
 	-lm
 
-libgdk_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
+libgdk11d_la_LDFLAGS = \
+	-version-info 1:3:0 \
          @GLIB_LIBS@	\
          @x_ldflags@	\
          @x_libs@	\
@@ -209,8 +209,8 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libgdk_la_LIBADD = 
-libgdk_la_OBJECTS =  gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \
+libgdk11d_la_LIBADD = 
+libgdk11d_la_OBJECTS =  gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \
 gdkdraw.lo gdkevents.lo gdkfont.lo gdkgc.lo gdkglobals.lo gdkim.lo \
 gdkimage.lo gdkinput.lo gdkpixmap.lo gdkproperty.lo gdkrgb.lo \
 gdkrectangle.lo gdkregion.lo gdkselection.lo gdkvisual.lo gdkwindow.lo \
@@ -233,8 +233,8 @@
 
 TAR = tar
 GZIP = --best
-SOURCES = $(libgdk_la_SOURCES) $(gxid_SOURCES)
-OBJECTS = $(libgdk_la_OBJECTS) $(gxid_OBJECTS)
+SOURCES = $(libgdk11d_la_SOURCES) $(gxid_SOURCES)
+OBJECTS = $(libgdk11d_la_OBJECTS) $(gxid_OBJECTS)
 
 all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
 
@@ -311,8 +311,8 @@
 
 maintainer-clean-libtool:
 
-libgdk.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES)
-	$(LINK) -rpath $(libdir) $(libgdk_la_LDFLAGS) $(libgdk_la_OBJECTS) $(libgdk_la_LIBADD) $(LIBS)
+libgdk11d.la: $(libgdk11d_la_OBJECTS) $(libgdk11d_la_DEPENDENCIES)
+	$(LINK) -rpath $(libdir) $(libgdk11d_la_LDFLAGS) $(libgdk11d_la_OBJECTS) $(libgdk11d_la_LIBADD) $(LIBS)
 
 mostlyclean-binPROGRAMS:
 
--- gtk/Makefile.in.orig	Mon Jan 18 08:16:47 1999
+++ gtk/Makefile.in	Thu Jan 21 02:41:48 1999
@@ -123,7 +123,7 @@
 
 gtkincludedir = $(includedir)/gtk
 
-lib_LTLIBRARIES = libgtk.la
+lib_LTLIBRARIES = libgtk11d.la
 
 static_SOURCES = \
 	gtkaccelgroup.c		\
@@ -233,7 +233,7 @@
 	fnmatch.c		\
 	fnmatch.h
 
-libgtk_la_SOURCES = \
+libgtk11d_la_SOURCES = \
 	$(static_SOURCES)	\
 	gtkmarshal.c
 
@@ -371,9 +371,8 @@
 	../gdk/gdktypes.h \
 	../gdk/gdkrgb.h
 
-libgtk_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
-	-release $(LT_RELEASE) 					\
+libgtk11d_la_LDFLAGS = \
+	-version-info 1:3:0 \
 	@GLIB_LIBS@ 						\
 	@x_ldflags@						\
 	@x_libs@ 						\
@@ -429,12 +428,12 @@
 # testthreads
 
 DEPS =	\
-	libgtk.la					\
-	$(top_builddir)/gdk/libgdk.la
+	libgtk11d.la					\
+	$(top_builddir)/gdk/libgdk11d.la
 
 LDADDS = \
-	libgtk.la					\
-	$(top_builddir)/gdk/libgdk.la			\
+	libgtk11d.la					\
+	$(top_builddir)/gdk/libgdk11d.la			\
 	@x_ldflags@					\
 	@x_libs@					\
 	@GLIB_LIBS@                                     \
@@ -469,8 +468,8 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libgtk_la_LIBADD = 
-libgtk_la_OBJECTS =  gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.lo \
+libgtk11d_la_LIBADD = 
+libgtk11d_la_OBJECTS =  gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.lo \
 gtkalignment.lo gtkarg.lo gtkarrow.lo gtkaspectframe.lo gtkbin.lo \
 gtkbindings.lo gtkbbox.lo gtkbox.lo gtkbutton.lo gtkcalendar.lo \
 gtkcheckbutton.lo gtkcheckmenuitem.lo gtkclist.lo gtkcolorsel.lo \
@@ -526,10 +525,10 @@
 
 TAR = tar
 GZIP = --best
-SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c testrgb.c testdnd.c simple.c
-OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o testrgb.o testdnd.o simple.o
+SOURCES = $(libgtk11d_la_SOURCES) testgtk.c testinput.c testselection.c testrgb.c testdnd.c simple.c
+OBJECTS = $(libgtk11d_la_OBJECTS) testgtk.o testinput.o testselection.o testrgb.o testdnd.o simple.o
 
-all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+all: Makefile $(LTLIBRARIES) $(HEADERS)
 
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
@@ -606,8 +605,8 @@
 
 maintainer-clean-libtool:
 
-libgtk.la: $(libgtk_la_OBJECTS) $(libgtk_la_DEPENDENCIES)
-	$(LINK) -rpath $(libdir) $(libgtk_la_LDFLAGS) $(libgtk_la_OBJECTS) $(libgtk_la_LIBADD) $(LIBS)
+libgtk11d.la: $(libgtk11d_la_OBJECTS) $(libgtk11d_la_DEPENDENCIES)
+	$(LINK) -rpath $(libdir) $(libgtk11d_la_LDFLAGS) $(libgtk11d_la_OBJECTS) $(libgtk11d_la_LIBADD) $(LIBS)
 
 mostlyclean-noinstPROGRAMS:
 
--- po/Makefile.in.in.orig	Mon Jan 18 07:58:44 1999
+++ po/Makefile.in.in	Thu Jan 21 02:41:48 1999
@@ -18,7 +18,7 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = $(prefix)/share
 localedir = $(datadir)/locale
 gnulocaledir = $(prefix)/share/locale
 gettextsrcdir = $(prefix)/share/gettext/po