]>
Commit | Line | Data |
---|---|---|
d2c9715f | 1 | diff -Nru WindowMaker-0.64.0/WINGs/Examples/Makefile.am WindowMaker-0.64.0.new/WINGs/Examples/Makefile.am |
83b217de | 2 | --- WindowMaker-0.64.0/WINGs/Examples/Makefile.am Tue Feb 13 18:58:56 2001 |
3 | +++ WindowMaker-0.64.0.new/WINGs/Examples/Makefile.am Tue Feb 13 18:56:19 2001 | |
7f2c3a0d | 4 | @@ -6,22 +6,22 @@ |
d2c9715f | 5 | noinst_PROGRAMS = connect server fontl puzzle |
cceea408 SZ |
6 | |
7 | ||
8 | -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ | |
9 | +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ | |
10 | @LIBPL@ | |
11 | ||
12 | ||
13 | -fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a | |
14 | +fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la | |
15 | ||
16 | -puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a | |
17 | +puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la | |
18 | ||
19 | -connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a | |
20 | +connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la | |
21 | ||
22 | -connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \ | |
23 | +connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \ | |
24 | @NETLIBS@ @LIBPL@ | |
32c7aa03 | 25 | |
8d088cb2 | 26 | -server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a |
27 | +server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la | |
28 | ||
7f2c3a0d | 29 | -server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \ |
30 | +server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \ | |
8d088cb2 | 31 | @NETLIBS@ @LIBPL@ |
7f2c3a0d | 32 | |
33 | ||
d2c9715f | 34 | diff -Nru WindowMaker-0.64.0/WINGs/Extras/Makefile.am WindowMaker-0.64.0.new/WINGs/Extras/Makefile.am |
83b217de | 35 | --- WindowMaker-0.64.0/WINGs/Extras/Makefile.am Tue Feb 13 18:58:56 2001 |
36 | +++ WindowMaker-0.64.0.new/WINGs/Extras/Makefile.am Tue Feb 13 18:56:19 2001 | |
7f2c3a0d | 37 | @@ -10,13 +10,13 @@ |
38 | include_HEADERS = wtableview.h wtabledelegates.h | |
39 | ||
40 | ||
41 | -lib_LIBRARIES = libExtraWINGs.a | |
42 | +lib_LTLIBRARIES = libExtraWINGs.la | |
43 | ||
44 | noinst_PROGRAMS = test | |
45 | ||
46 | EXTRA_DIST = | |
47 | ||
48 | -libExtraWINGs_a_SOURCES = \ | |
49 | +libExtraWINGs_la_SOURCES = \ | |
50 | wtableview.c \ | |
51 | wtabledelegates.c \ | |
52 | wtableview.h \ | |
cceea408 SZ |
53 | @@ -26,7 +26,7 @@ |
54 | INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \ | |
55 | -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG | |
32c7aa03 | 56 | |
cceea408 SZ |
57 | -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ |
58 | +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ | |
59 | @LIBPL@ | |
60 | ||
61 | test_LDADD = wtableview.o wtabledelegates.o $(LDADD) | |
d2c9715f | 62 | diff -Nru WindowMaker-0.64.0/WINGs/Makefile.am WindowMaker-0.64.0.new/WINGs/Makefile.am |
83b217de | 63 | --- WindowMaker-0.64.0/WINGs/Makefile.am Tue Feb 13 18:58:56 2001 |
64 | +++ WindowMaker-0.64.0.new/WINGs/Makefile.am Tue Feb 13 19:00:21 2001 | |
65 | @@ -4,22 +4,19 @@ | |
32c7aa03 | 66 | |
d2c9715f | 67 | SUBDIRS = WINGs . Documentation Resources Examples Extras Tests |
32c7aa03 | 68 | |
d2c9715f | 69 | - |
83b217de | 70 | - |
71 | -#libWINGs_la_LDFLAGS = -version-info 1:1:0 | |
72 | - | |
73 | bin_SCRIPTS = get-wings-flags get-wutil-flags | |
d2c9715f | 74 | |
83b217de | 75 | -lib_LIBRARIES = libWINGs.a libWUtil.a |
76 | - | |
77 | +lib_LTLIBRARIES = libWINGs.la libWUtil.la | |
b0f707bd | 78 | |
cceea408 | 79 | -LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @LIBPL@ |
83b217de | 80 | +libWINGs_la_LDFLAGS = -version-info 1:1:0 |
81 | +libWUtil_la_LDFLAGS = -version-info 1:1:0 | |
32c7aa03 | 82 | |
83b217de | 83 | +LDADD= libWINGs.la $(top_builddir)/wrlib/libwraster.la @LIBPL@ |
cceea408 | 84 | |
260b62b4 | 85 | EXTRA_DIST = BUGS |
32c7aa03 AF |
86 | |
87 | # wbutton.c | |
88 | -libWINGs_a_SOURCES = \ | |
89 | +libWINGs_la_SOURCES = \ | |
260b62b4 | 90 | array.c \ |
d2c9715f | 91 | bagtree.c \ |
92 | configuration.c \ | |
83b217de | 93 | @@ -74,7 +71,7 @@ |
260b62b4 | 94 | wwindow.c |
5a1d6215 | 95 | |
96 | ||
97 | -libWUtil_a_SOURCES = \ | |
98 | +libWUtil_la_SOURCES = \ | |
260b62b4 | 99 | array.c \ |
d2c9715f | 100 | bagtree.c \ |
101 | connection.c \ | |
102 | diff -Nru WindowMaker-0.64.0/WINGs/Tests/Makefile.am WindowMaker-0.64.0.new/WINGs/Tests/Makefile.am | |
83b217de | 103 | --- WindowMaker-0.64.0/WINGs/Tests/Makefile.am Tue Feb 13 18:58:56 2001 |
104 | +++ WindowMaker-0.64.0.new/WINGs/Tests/Makefile.am Tue Feb 13 18:56:19 2001 | |
cceea408 SZ |
105 | @@ -4,13 +4,13 @@ |
106 | ||
107 | noinst_PROGRAMS = wtest wmquery wmfile testmywidget testcolorpanel | |
108 | ||
109 | -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ | |
110 | +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ | |
111 | @LIBPL@ | |
112 | ||
113 | ||
114 | testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h | |
115 | ||
116 | -wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a | |
117 | +wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la | |
118 | ||
119 | ||
120 | EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png | |
d2c9715f | 121 | diff -Nru WindowMaker-0.64.0/WPrefs.app/Makefile.am WindowMaker-0.64.0.new/WPrefs.app/Makefile.am |
83b217de | 122 | --- WindowMaker-0.64.0/WPrefs.app/Makefile.am Tue Feb 13 18:58:56 2001 |
123 | +++ WindowMaker-0.64.0.new/WPrefs.app/Makefile.am Tue Feb 13 18:56:19 2001 | |
260b62b4 | 124 | @@ -46,10 +46,10 @@ |
125 | ||
126 | INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ | |
127 | ||
128 | -WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a | |
129 | +WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la | |
130 | ||
131 | WPrefs_LDADD = \ | |
132 | - $(top_builddir)/WINGs/libWINGs.a\ | |
133 | + $(top_builddir)/WINGs/libWINGs.la\ | |
134 | $(top_builddir)/wrlib/libwraster.la \ | |
135 | @LIBPL@ \ | |
136 | @INTLIBS@ | |
d2c9715f | 137 | diff -Nru WindowMaker-0.64.0/src/Makefile.am WindowMaker-0.64.0.new/src/Makefile.am |
83b217de | 138 | --- WindowMaker-0.64.0/src/Makefile.am Tue Feb 13 18:58:56 2001 |
139 | +++ WindowMaker-0.64.0.new/src/Makefile.am Tue Feb 13 18:56:19 2001 | |
260b62b4 | 140 | @@ -113,7 +113,7 @@ |
32c7aa03 AF |
141 | |
142 | ||
143 | wmaker_LDADD = \ | |
144 | - $(top_builddir)/WINGs/libWINGs.a\ | |
145 | + $(top_builddir)/WINGs/libWINGs.la\ | |
146 | $(top_builddir)/wrlib/libwraster.la\ | |
32c7aa03 | 147 | @LIBPL@ \ |
260b62b4 | 148 | @XLIBS@ \ |
d2c9715f | 149 | diff -Nru WindowMaker-0.64.0/test/Makefile.am WindowMaker-0.64.0.new/test/Makefile.am |
83b217de | 150 | --- WindowMaker-0.64.0/test/Makefile.am Tue Feb 13 18:58:56 2001 |
151 | +++ WindowMaker-0.64.0.new/test/Makefile.am Tue Feb 13 18:56:19 2001 | |
32c7aa03 AF |
152 | @@ -8,7 +8,7 @@ |
153 | ||
154 | wtest_SOURCES = wtest.c | |
155 | ||
156 | -wtest_LDADD = $(top_builddir)/wmlib/libWMaker.a @XLFLAGS@ @XLIBS@ | |
157 | +wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@ | |
158 | ||
159 | ||
160 | INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib | |
d2c9715f | 161 | diff -Nru WindowMaker-0.64.0/util/Makefile.am WindowMaker-0.64.0.new/util/Makefile.am |
83b217de | 162 | --- WindowMaker-0.64.0/util/Makefile.am Tue Feb 13 18:58:56 2001 |
163 | +++ WindowMaker-0.64.0.new/util/Makefile.am Tue Feb 13 18:56:19 2001 | |
d2c9715f | 164 | @@ -36,19 +36,19 @@ |
165 | geticonset_LDADD= $(liblist) | |
166 | ||
167 | wmagnify_LDADD = \ | |
168 | - $(top_builddir)/WINGs/libWINGs.a \ | |
169 | + $(top_builddir)/WINGs/libWINGs.la \ | |
170 | $(top_builddir)/wrlib/libwraster.la \ | |
171 | @LIBPL@ \ | |
172 | @DLLIBS@ | |
173 | ||
174 | wmsetup_LDADD = \ | |
175 | - $(top_builddir)/WINGs/libWINGs.a \ | |
176 | + $(top_builddir)/WINGs/libWINGs.la \ | |
177 | $(top_builddir)/wrlib/libwraster.la \ | |
178 | @LIBPL@ \ | |
260b62b4 | 179 | @DLLIBS@ |
5a1d6215 | 180 | |
181 | wmsetbg_LDADD = \ | |
182 | - $(top_builddir)/WINGs/libWINGs.a \ | |
183 | + $(top_builddir)/WINGs/libWINGs.la \ | |
184 | $(top_builddir)/wrlib/libwraster.la \ | |
5a1d6215 | 185 | @LIBPL@ \ |
260b62b4 | 186 | @DLLIBS@ |
d2c9715f | 187 | diff -Nru WindowMaker-0.64.0/wmlib/Makefile.am WindowMaker-0.64.0.new/wmlib/Makefile.am |
83b217de | 188 | --- WindowMaker-0.64.0/wmlib/Makefile.am Tue Feb 13 18:58:56 2001 |
189 | +++ WindowMaker-0.64.0.new/wmlib/Makefile.am Tue Feb 13 18:56:19 2001 | |
32c7aa03 AF |
190 | @@ -1,13 +1,13 @@ |
191 | ||
192 | AUTOMAKE_OPTIONS = no-dependencies | |
193 | ||
194 | -lib_LIBRARIES = libWMaker.a | |
cceea408 | 195 | +lib_LTLIBRARIES = libWMaker.la |
32c7aa03 AF |
196 | |
197 | include_HEADERS = WMaker.h | |
198 | ||
260b62b4 | 199 | INCLUDES = $(DFLAGS) @XCFLAGS@ |
32c7aa03 AF |
200 | |
201 | -libWMaker_a_SOURCES = \ | |
202 | +libWMaker_la_SOURCES = \ | |
203 | menu.c \ | |
204 | app.c \ | |
205 | event.c \ | |
206 | @@ -15,3 +15,4 @@ | |
207 | app.h \ | |
208 | menu.h | |
209 | ||
210 | +libWMaker_la_LDFLAGS = -version-info 1:1:1 |