]> git.pld-linux.org Git - packages/WindowMaker.git/blame - WindowMaker-shared.patch
projects / packages / WindowMaker.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- release 4: libwraster2{,-devel} added to Obsoletes for allow upgrade from MDK.
[packages/WindowMaker.git] / WindowMaker-shared.patch
CommitLineData
0abc564d
JB		 1diff -Nur WindowMaker-0.70.0.orig/WINGs/Examples/Makefile.am WindowMaker-0.70.0/WINGs/Examples/Makefile.am
2--- WindowMaker-0.70.0.orig/WINGs/Examples/Makefile.am Thu Oct 4 05:39:17 2001
3+++ WindowMaker-0.70.0/WINGs/Examples/Makefile.am Thu Oct 18 16:54:22 2001
4@@ -6,21 +6,21 @@
d2c9715f 5 noinst_PROGRAMS = connect server fontl puzzle
cceea408
SZ		 6
7
0abc564d
JB		 8-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la
9+LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la
cceea408
SZ		 10
11
12-fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
13+fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
14
15-puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
16+puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
17
18-connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
19+connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
20
21-connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
22+connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \
0abc564d 23 @NETLIBS@
32c7aa03 24
8d088cb2 25-server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
26+server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
27
0abc564d
JB		 28-server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ @NETLIBS@
29+server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ @NETLIBS@
7f2c3a0d 30
31
0abc564d
JB		 32 INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
33diff -Nur WindowMaker-0.70.0.orig/WINGs/Extras/Makefile.am WindowMaker-0.70.0/WINGs/Extras/Makefile.am
34--- WindowMaker-0.70.0.orig/WINGs/Extras/Makefile.am Thu Oct 4 05:39:17 2001
35+++ WindowMaker-0.70.0/WINGs/Extras/Makefile.am Thu Oct 18 16:54:22 2001
7f2c3a0d 36@@ -10,13 +10,13 @@
37 include_HEADERS = wtableview.h wtabledelegates.h
38
39
40-lib_LIBRARIES = libExtraWINGs.a
41+lib_LTLIBRARIES = libExtraWINGs.la
42
43 noinst_PROGRAMS = test
44
45 EXTRA_DIST =
46
47-libExtraWINGs_a_SOURCES = \
48+libExtraWINGs_la_SOURCES = \
49 wtableview.c \
50 wtabledelegates.c \
51 wtableview.h \
cceea408
SZ		 52@@ -26,7 +26,7 @@
53 INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
54 -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
32c7aa03 55
0abc564d
JB		 56-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la
57+LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la
cceea408
SZ		 58
59 test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
0abc564d
JB		 60
61diff -Nur WindowMaker-0.70.0.orig/WINGs/Makefile.am WindowMaker-0.70.0/WINGs/Makefile.am
62--- WindowMaker-0.70.0.orig/WINGs/Makefile.am Thu Oct 4 05:39:17 2001
63+++ WindowMaker-0.70.0/WINGs/Makefile.am Thu Oct 18 16:54:22 2001
64@@ -4,22 +4,18 @@
32c7aa03 65
8a5e3c0d 66 SUBDIRS = WINGs . po Documentation Resources Examples Extras Tests
32c7aa03 67
d2c9715f 68-
83b217de 69-
70-#libWINGs_la_LDFLAGS = -version-info 1:1:0
71-
72 bin_SCRIPTS = get-wings-flags get-wutil-flags
d2c9715f 73
83b217de 74-lib_LIBRARIES = libWINGs.a libWUtil.a
0abc564d 75+LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@
32c7aa03 76
8a5e3c0d 77+lib_LTLIBRARIES = libWINGs.la libWUtil.la
cceea408 78
0abc564d
JB		 79-LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@
80
81
260b62b4 82 EXTRA_DIST = BUGS
32c7aa03
AF		 83
84 # wbutton.c
85-libWINGs_a_SOURCES = \
86+libWINGs_la_SOURCES = \
260b62b4 87 array.c \
d2c9715f 88 bagtree.c \
89 configuration.c \
0abc564d 90@@ -80,7 +76,7 @@
260b62b4 91 wwindow.c
5a1d6215 92
93
94-libWUtil_a_SOURCES = \
95+libWUtil_la_SOURCES = \
260b62b4 96 array.c \
d2c9715f 97 bagtree.c \
98 connection.c \
0abc564d
JB		 99diff -Nur WindowMaker-0.70.0.orig/WINGs/Tests/Makefile.am WindowMaker-0.70.0/WINGs/Tests/Makefile.am
100--- WindowMaker-0.70.0.orig/WINGs/Tests/Makefile.am Thu Oct 4 05:39:17 2001
101+++ WindowMaker-0.70.0/WINGs/Tests/Makefile.am Thu Oct 18 16:54:22 2001
102@@ -4,12 +4,12 @@
cceea408 103
0abc564d 104 noinst_PROGRAMS = wtest wmquery wmfile testmywidget
cceea408 105
0abc564d
JB		 106-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la
107+LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la
cceea408
SZ		 108
109
110 testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
111
112-wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
113+wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
114
115
116 EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
0abc564d
JB		 117diff -Nur WindowMaker-0.70.0.orig/WPrefs.app/Makefile.am WindowMaker-0.70.0/WPrefs.app/Makefile.am
118--- WindowMaker-0.70.0.orig/WPrefs.app/Makefile.am Thu Oct 4 05:39:18 2001
119+++ WindowMaker-0.70.0/WPrefs.app/Makefile.am Thu Oct 18 16:54:22 2001
260b62b4 120@@ -46,10 +46,10 @@
121
122 INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
123
124-WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
125+WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
126
127 WPrefs_LDADD = \
128- $(top_builddir)/WINGs/libWINGs.a\
129+ $(top_builddir)/WINGs/libWINGs.la\
130 $(top_builddir)/wrlib/libwraster.la \
260b62b4 131 @INTLIBS@
0abc564d
JB		 132
133diff -Nur WindowMaker-0.70.0.orig/src/Makefile.am WindowMaker-0.70.0/src/Makefile.am
134--- WindowMaker-0.70.0.orig/src/Makefile.am Thu Oct 4 05:39:18 2001
135+++ WindowMaker-0.70.0/src/Makefile.am Thu Oct 18 16:54:22 2001
136@@ -111,7 +111,7 @@
32c7aa03
AF		 137
138
139 wmaker_LDADD = \
140- $(top_builddir)/WINGs/libWINGs.a\
141+ $(top_builddir)/WINGs/libWINGs.la\
142 $(top_builddir)/wrlib/libwraster.la\
260b62b4 143 @XLIBS@ \
0abc564d
JB		 144 @INTLIBS@ \
145diff -Nur WindowMaker-0.70.0.orig/test/Makefile.am WindowMaker-0.70.0/test/Makefile.am
146--- WindowMaker-0.70.0.orig/test/Makefile.am Sat Oct 2 23:16:11 1999
147+++ WindowMaker-0.70.0/test/Makefile.am Thu Oct 18 16:54:22 2001
32c7aa03
AF		 148@@ -8,7 +8,7 @@
149
150 wtest_SOURCES = wtest.c
151
152-wtest_LDADD = $(top_builddir)/wmlib/libWMaker.a @XLFLAGS@ @XLIBS@
153+wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@
154
155
156 INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib
0abc564d
JB		 157diff -Nur WindowMaker-0.70.0.orig/util/Makefile.am WindowMaker-0.70.0/util/Makefile.am
158--- WindowMaker-0.70.0.orig/util/Makefile.am Fri Oct 5 02:40:42 2001
159+++ WindowMaker-0.70.0/util/Makefile.am Thu Oct 18 16:55:06 2001
160@@ -20,36 +20,36 @@
161 # library dependancies using the libPropList.la file
162 liblist= @LIBRARY_SEARCH_PATH@ @X_EXTRA_LIBS@
163
164-wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
165+wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
166
167-wdread_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
168+wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
169
170 wxcopy_LDADD = @XLFLAGS@ @XLIBS@
171
172 wxpaste_LDADD = @XLFLAGS@ @XLIBS@
173
174-getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
175+getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
176
177 setstyle_LDADD = \
178- $(top_builddir)/WINGs/libWUtil.a \
179+ $(top_builddir)/WINGs/libWUtil.la \
180 @XLFLAGS@ @XLIBS@ $(liblist)
181
182-seticons_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist)
183+seticons_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist)
184
185-geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist)
186+geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist)
d2c9715f 187
188 wmagnify_LDADD = \
189- $(top_builddir)/WINGs/libWINGs.a \
190+ $(top_builddir)/WINGs/libWINGs.la \
191 $(top_builddir)/wrlib/libwraster.la \
d2c9715f 192 @DLLIBS@
193
194 wmsetup_LDADD = \
195- $(top_builddir)/WINGs/libWINGs.a \
196+ $(top_builddir)/WINGs/libWINGs.la \
197 $(top_builddir)/wrlib/libwraster.la \
260b62b4 198 @DLLIBS@
5a1d6215 199
200 wmsetbg_LDADD = \
201- $(top_builddir)/WINGs/libWINGs.a \
202+ $(top_builddir)/WINGs/libWINGs.la \
203 $(top_builddir)/wrlib/libwraster.la \
260b62b4 204 @DLLIBS@
0abc564d
JB		 205
206diff -Nur WindowMaker-0.70.0.orig/wmlib/Makefile.am WindowMaker-0.70.0/wmlib/Makefile.am
207--- WindowMaker-0.70.0.orig/wmlib/Makefile.am Mon Apr 10 02:59:35 2000
208+++ WindowMaker-0.70.0/wmlib/Makefile.am Thu Oct 18 16:54:22 2001
32c7aa03
AF		 209@@ -1,13 +1,13 @@
210
211 AUTOMAKE_OPTIONS = no-dependencies
212
213-lib_LIBRARIES = libWMaker.a
cceea408 214+lib_LTLIBRARIES = libWMaker.la
32c7aa03
AF		 215
216 include_HEADERS = WMaker.h
217
260b62b4 218 INCLUDES = $(DFLAGS) @XCFLAGS@
32c7aa03
AF		 219
220-libWMaker_a_SOURCES = \
221+libWMaker_la_SOURCES = \
222 menu.c \
223 app.c \
224 event.c \
225@@ -15,3 +15,4 @@
226 app.h \
227 menu.h
228
229+libWMaker_la_LDFLAGS = -version-info 1:1:1
NeXT-alike window manager
This page took 0.102223 seconds and 4 git commands to generate.