]> git.pld-linux.org Git - packages/WindowMaker.git/blame_incremental - WindowMaker-shared.patch
projects / packages / WindowMaker.git / blame_incremental
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (non-incremental) | history | HEAD
- use GNUSTEP_ROOT instead of GNUSTEP_LOCAL_ROOT
[packages/WindowMaker.git] / WindowMaker-shared.patch
... / ...
CommitLineData
1--- WindowMaker-0.80.0/WINGs/Examples/Makefile.am.orig Thu Oct 11 11:59:54 2001
2+++ WindowMaker-0.80.0/WINGs/Examples/Makefile.am Thu Jan 3 06:09:41 2002
3@@ -2,31 +2,18 @@
4
5 AUTOMAKE_OPTIONS = no-dependencies
6
7-
8 noinst_PROGRAMS = connect server fontl puzzle colorpick
9
10+LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
11+ $(XFTLIBS) $(INTLIBS)
12
13-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
14- @XFTLIBS@ @INTLIBS@
15-
16-colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
17-
18-fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
19-
20-puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
21-
22-connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
23-
24-connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
25- @NETLIBS@ @INTLIBS@
26-
27-server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
28-
29-server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
30- @NETLIBS@ @INTLIBS@
31+connect_LDADD = $(top_builddir)/WINGs/libWUtil.la $(LIBRARY_SEARCH_PATH) \
32+ $(NETLIBS) $(INTLIBS)
33
34+server_LDADD = $(top_builddir)/WINGs/libWUtil.la $(LIBRARY_SEARCH_PATH) \
35+ $(NETLIBS) $(INTLIBS)
36
37 INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
38- -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
39+ -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(HEADER_SEARCH_PATH) -DDEBUG
40
41
42--- WindowMaker-0.80.0/WINGs/Extras/Makefile.am.orig Thu Oct 11 11:59:54 2001
43+++ WindowMaker-0.80.0/WINGs/Extras/Makefile.am Thu Jan 3 06:12:10 2002
44@@ -2,33 +2,28 @@
45
46 AUTOMAKE_OPTIONS = no-dependencies
47
48-
49-
50 # is this a kluge? if so, how should i do it?
51 includedir = @includedir@/WINGs
52
53 include_HEADERS = wtableview.h wtabledelegates.h
54
55-
56-lib_LIBRARIES = libExtraWINGs.a
57+lib_LTLIBRARIES = libExtraWINGs.la
58+libExtraWINGs_la_LIBADD = $(top_builddir)/WINGs/libWINGs.la
59
60 noinst_PROGRAMS = test
61
62-EXTRA_DIST =
63-
64-libExtraWINGs_a_SOURCES = \
65+libExtraWINGs_la_SOURCES = \
66 wtableview.c \
67 wtabledelegates.c \
68 wtableview.h \
69 wtabledelegates.h
70
71 AM_CFLAGS = @NOSTRICTALIASING@
72
73 INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
74- -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
75+ -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(HEADER_SEARCH_PATH)
76
77-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
78- @XFTLIBS@ @INTLIBS@
79+LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
80+ $(XFTLIBS) $(INTLIBS)
81
82 test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
83-
84--- WindowMaker-0.70.0.orig/WINGs/Makefile.am Thu Oct 4 05:39:17 2001
85+++ WindowMaker-0.70.0/WINGs/Makefile.am Thu Oct 18 16:54:22 2001
86@@ -4,24 +4,21 @@
87
88 SUBDIRS = WINGs . po Documentation Resources Examples Extras Tests
89
90-
91-
92-#libWINGs_la_LDFLAGS = -version-info 1:1:0
93-
94 bin_SCRIPTS = get-wings-flags get-wutil-flags
95
96-lib_LIBRARIES = libWINGs.a libWUtil.a
97+LDADD= libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
98
99+lib_LTLIBRARIES = libWINGs.la libWUtil.la
100+libWINGs_la_LIBADD = $(top_builddir)/wrlib/libwraster.la $(XFTLIBS)
101
102-LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@
103
104
105 EXTRA_DIST = BUGS python/Makefile python/README python/WINGs.i \
106 python/WINGs.py python/setup.py python/test.py
107
108
109 # wbutton.c
110-libWINGs_a_SOURCES = \
111+libWINGs_la_SOURCES = \
112 array.c \
113 bagtree.c \
114 configuration.c \
115@@ -80,7 +78,7 @@
116 wwindow.c
117
118
119-libWUtil_a_SOURCES = \
120+libWUtil_la_SOURCES = \
121 array.c \
122 bagtree.c \
123 connection.c \
124diff -ur WindowMaker-CVS-20040723.orig/WINGs/Tests/Makefile.am WindowMaker-CVS-20040723/WINGs/Tests/Makefile.am
125--- WindowMaker-CVS-20040723.orig/WINGs/Tests/Makefile.am 2004-04-11 07:01:02.000000000 +0200
126+++ WindowMaker-CVS-20040723/WINGs/Tests/Makefile.am 2004-09-05 03:55:39.906430016 +0200
127@@ -4,19 +4,16 @@
128
129 noinst_PROGRAMS = wtest wmquery wmfile testmywidget
130
131-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
132- @XFTLIBS@ @INTLIBS@
133+LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
134+ $(XFTLIBS) $(INTLIBS)
135
136
137 testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
138
139-wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
140-
141-
142 EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
143
144 INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
145- -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ \
146+ -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(XFTFLAGS) $(HEADER_SEARCH_PATH) \
147 -DDEBUG
148
149
150--- WindowMaker-0.70.0.orig/WPrefs.app/Makefile.am Thu Oct 4 05:39:18 2001
151+++ WindowMaker-0.70.0/WPrefs.app/Makefile.am Thu Oct 18 16:54:22 2001
152@@ -46,10 +46,10 @@
153
154 INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
155
156-WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
157+WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
158
159 WPrefs_LDADD = \
160- $(top_builddir)/WINGs/libWINGs.a\
161+ $(top_builddir)/WINGs/libWINGs.la\
162 $(top_builddir)/wrlib/libwraster.la \
163 @XFTLIBS@ \
164 @INTLIBS@
165diff -Nur WindowMaker-0.70.0.orig/src/Makefile.am WindowMaker-0.70.0/src/Makefile.am
166--- WindowMaker-0.70.0.orig/src/Makefile.am Thu Oct 4 05:39:18 2001
167+++ WindowMaker-0.70.0/src/Makefile.am Thu Oct 18 16:54:22 2001
168@@ -113,7 +113,7 @@
169
170
171 wmaker_LDADD = \
172- $(top_builddir)/WINGs/libWINGs.a\
173+ $(top_builddir)/WINGs/libWINGs.la\
174 $(top_builddir)/wrlib/libwraster.la\
175 @XFTLIBS@ \
176 @XLIBS@ \
177diff -Nur WindowMaker-0.70.0.orig/test/Makefile.am WindowMaker-0.70.0/test/Makefile.am
178--- WindowMaker-0.70.0.orig/test/Makefile.am Sat Oct 2 23:16:11 1999
179+++ WindowMaker-0.70.0/test/Makefile.am Thu Oct 18 16:54:22 2001
180@@ -8,7 +8,7 @@
181
182 wtest_SOURCES = wtest.c
183
184-wtest_LDADD = $(top_builddir)/wmlib/libWMaker.a @XLFLAGS@ @XLIBS@
185+wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@
186
187
188 INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib
189--- WindowMaker-0.80.0/util/Makefile.am~ Thu Oct 11 11:59:54 2001
190+++ WindowMaker-0.80.0/util/Makefile.am Thu Jan 3 07:12:53 2002
191@@ -1,8 +1,6 @@
192
193 AUTOMAKE_OPTIONS = no-dependencies
194
195-pkgdatadir = $(datadir)/@PACKAGE@
196-
197 bin_PROGRAMS = wxcopy wxpaste wdwrite wdread getstyle setstyle convertfonts \
198 seticons geticonset wmsetbg wmsetup wmagnify
199
200@@ -12,49 +10,49 @@
201 EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new directjpeg.c wkdemenu.pl
202
203 INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
204- @HEADER_SEARCH_PATH@ \
205- -DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
206+ $(HEADER_SEARCH_PATH) \
207+ -DETCDIR=\"$(sysconfdir)\" -DDATADIR=\"$(pkgdatadir)\"
208
209-liblist= @LIBRARY_SEARCH_PATH@ @INTLIBS@
210+liblist= $(LIBRARY_SEARCH_PATH) $(INTLIBS)
211
212-wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
213+wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
214
215-wdread_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
216+wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
217
218-wxcopy_LDADD = @XLFLAGS@ @XLIBS@
219+wxcopy_LDADD = $(XLFLAGS) $(XLIBS)
220
221-wxpaste_LDADD = @XLFLAGS@ @XLIBS@
222+wxpaste_LDADD = $(XLFLAGS) $(XLIBS)
223
224-getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
225+getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
226
227 getstyle_SOURCES = getstyle.c fontconv.c
228
229 setstyle_LDADD = \
230- $(top_builddir)/WINGs/libWUtil.a \
231- @XLFLAGS@ @XLIBS@ $(liblist)
232+ $(top_builddir)/WINGs/libWUtil.la \
233+ $(XLFLAGS) $(XLIBS) $(liblist)
234
235 setstyle_SOURCES = setstyle.c fontconv.c
236
237-convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
238+convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
239
240 convertfonts_SOURCES = convertfonts.c fontconv.c
241
242-seticons_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist)
243+seticons_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist)
244
245-geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist)
246+geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist)
247
248 wmagnify_LDADD = \
249- $(top_builddir)/WINGs/libWINGs.a \
250+ $(top_builddir)/WINGs/libWINGs.la \
251 $(top_builddir)/wrlib/libwraster.la \
252 @XFTLIBS@ @INTLIBS@ @DLLIBS@
253
254 wmsetup_LDADD = \
255- $(top_builddir)/WINGs/libWINGs.a \
256+ $(top_builddir)/WINGs/libWINGs.la \
257 $(top_builddir)/wrlib/libwraster.la \
258 @XFTLIBS@ @INTLIBS@ @DLLIBS@
259
260 wmsetbg_LDADD = \
261- $(top_builddir)/WINGs/libWINGs.a \
262+ $(top_builddir)/WINGs/libWINGs.la \
263 $(top_builddir)/wrlib/libwraster.la \
264 @XFTLIBS@ @INTLIBS@ @DLLIBS@
265
266--- WindowMaker-0.70.0.orig/wmlib/Makefile.am Mon Apr 10 02:59:35 2000
267+++ WindowMaker-0.70.0/wmlib/Makefile.am Thu Oct 18 16:54:22 2001
268@@ -1,13 +1,14 @@
269
270 AUTOMAKE_OPTIONS = no-dependencies
271
272-lib_LIBRARIES = libWMaker.a
273+lib_LTLIBRARIES = libWMaker.la
274+libWMaker_la_LIBADD = $(X_LIBS) -lX11
275
276 include_HEADERS = WMaker.h
277
278 INCLUDES = $(DFLAGS) @XCFLAGS@
279
280-libWMaker_a_SOURCES = \
281+libWMaker_la_SOURCES = \
282 menu.c \
283 app.c \
284 event.c \
285@@ -15,6 +15,8 @@
286 app.h \
287 menu.h
288
289+libWMaker_la_LDFLAGS = -version-info 1:1:1
290+
291 DISTCLEANFILES = wmlib.pc
292
293 install-exec-local:
NeXT-alike window manager
This page took 0.029725 seconds and 4 git commands to generate.