]>
Commit | Line | Data |
---|---|---|
cceea408 SZ |
1 | diff -Naur WindowMaker-0.63.1/WINGs/Examples/Makefile.am WindowMaker-0.63.1-p/WINGs/Examples/Makefile.am |
2 | --- WindowMaker-0.63.1/WINGs/Examples/Makefile.am Sun Jan 7 00:21:58 2001 | |
3 | +++ WindowMaker-0.63.1-p/WINGs/Examples/Makefile.am Mon Jan 8 13:34:33 2001 | |
4 | @@ -6,17 +6,17 @@ | |
5 | noinst_PROGRAMS = connect fontl puzzle | |
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 AF |
25 | |
26 | ||
cceea408 SZ |
27 | diff -Naur WindowMaker-0.63.1/WINGs/Extras/Makefile.am WindowMaker-0.63.1-p/WINGs/Extras/Makefile.am |
28 | --- WindowMaker-0.63.1/WINGs/Extras/Makefile.am Sun Jan 7 00:21:58 2001 | |
29 | +++ WindowMaker-0.63.1-p/WINGs/Extras/Makefile.am Mon Jan 8 13:35:39 2001 | |
30 | @@ -26,7 +26,7 @@ | |
31 | INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \ | |
32 | -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG | |
32c7aa03 | 33 | |
cceea408 SZ |
34 | -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ |
35 | +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ | |
36 | @LIBPL@ | |
37 | ||
38 | test_LDADD = wtableview.o wtabledelegates.o $(LDADD) | |
39 | diff -Naur WindowMaker-0.63.1/WINGs/Makefile.am WindowMaker-0.63.1-p/WINGs/Makefile.am | |
40 | --- WindowMaker-0.63.1/WINGs/Makefile.am Sun Jan 7 00:21:58 2001 | |
41 | +++ WindowMaker-0.63.1-p/WINGs/Makefile.am Mon Jan 8 13:33:37 2001 | |
42 | @@ -15,16 +15,16 @@ | |
32c7aa03 | 43 | |
260b62b4 | 44 | bin_SCRIPTS = get-wings-flags get-wutil-flags |
32c7aa03 | 45 | |
260b62b4 | 46 | -lib_LIBRARIES = libWINGs.a libWUtil.a |
cceea408 | 47 | +lib_LTLIBRARIES = libWINGs.la libWUtil.la |
b0f707bd | 48 | |
b0f707bd | 49 | |
cceea408 | 50 | -LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @LIBPL@ |
260b62b4 | 51 | +LDADD= libWINGs.la $(top_builddir)/wrlib/libwraster.la @LIBPL@ |
32c7aa03 | 52 | |
cceea408 | 53 | |
260b62b4 | 54 | EXTRA_DIST = BUGS |
32c7aa03 AF |
55 | |
56 | # wbutton.c | |
57 | -libWINGs_a_SOURCES = \ | |
58 | +libWINGs_la_SOURCES = \ | |
59 | WINGs.h \ | |
60 | WINGsP.h \ | |
260b62b4 | 61 | array.c \ |
cceea408 | 62 | @@ -80,7 +80,7 @@ |
260b62b4 | 63 | wwindow.c |
5a1d6215 | 64 | |
65 | ||
66 | -libWUtil_a_SOURCES = \ | |
67 | +libWUtil_la_SOURCES = \ | |
68 | WINGs.h \ | |
69 | WINGsP.h \ | |
260b62b4 | 70 | array.c \ |
cceea408 SZ |
71 | diff -Naur WindowMaker-0.63.1/WINGs/Tests/Makefile.am WindowMaker-0.63.1-p/WINGs/Tests/Makefile.am |
72 | --- WindowMaker-0.63.1/WINGs/Tests/Makefile.am Sun Jan 7 00:21:58 2001 | |
73 | +++ WindowMaker-0.63.1-p/WINGs/Tests/Makefile.am Mon Jan 8 13:36:52 2001 | |
74 | @@ -4,13 +4,13 @@ | |
75 | ||
76 | noinst_PROGRAMS = wtest wmquery wmfile testmywidget testcolorpanel | |
77 | ||
78 | -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ | |
79 | +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ | |
80 | @LIBPL@ | |
81 | ||
82 | ||
83 | testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h | |
84 | ||
85 | -wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a | |
86 | +wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la | |
87 | ||
88 | ||
89 | EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png | |
90 | diff -Naur WindowMaker-0.63.1/WPrefs.app/Makefile.am WindowMaker-0.63.1-p/WPrefs.app/Makefile.am | |
260b62b4 | 91 | --- WindowMaker-0.63.1/WPrefs.app/Makefile.am Sun Jan 7 00:21:58 2001 |
cceea408 | 92 | +++ WindowMaker-0.63.1-p/WPrefs.app/Makefile.am Mon Jan 8 13:33:37 2001 |
260b62b4 | 93 | @@ -46,10 +46,10 @@ |
94 | ||
95 | INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ | |
96 | ||
97 | -WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a | |
98 | +WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la | |
99 | ||
100 | WPrefs_LDADD = \ | |
101 | - $(top_builddir)/WINGs/libWINGs.a\ | |
102 | + $(top_builddir)/WINGs/libWINGs.la\ | |
103 | $(top_builddir)/wrlib/libwraster.la \ | |
104 | @LIBPL@ \ | |
105 | @INTLIBS@ | |
cceea408 | 106 | diff -Naur WindowMaker-0.63.1/src/Makefile.am WindowMaker-0.63.1-p/src/Makefile.am |
260b62b4 | 107 | --- WindowMaker-0.63.1/src/Makefile.am Sun Jan 7 00:21:58 2001 |
cceea408 | 108 | +++ WindowMaker-0.63.1-p/src/Makefile.am Mon Jan 8 13:33:37 2001 |
260b62b4 | 109 | @@ -113,7 +113,7 @@ |
32c7aa03 AF |
110 | |
111 | ||
112 | wmaker_LDADD = \ | |
113 | - $(top_builddir)/WINGs/libWINGs.a\ | |
114 | + $(top_builddir)/WINGs/libWINGs.la\ | |
115 | $(top_builddir)/wrlib/libwraster.la\ | |
32c7aa03 | 116 | @LIBPL@ \ |
260b62b4 | 117 | @XLIBS@ \ |
cceea408 | 118 | diff -Naur WindowMaker-0.63.1/test/Makefile.am WindowMaker-0.63.1-p/test/Makefile.am |
260b62b4 | 119 | --- WindowMaker-0.63.1/test/Makefile.am Sun Jan 7 00:21:58 2001 |
cceea408 | 120 | +++ WindowMaker-0.63.1-p/test/Makefile.am Mon Jan 8 13:33:37 2001 |
32c7aa03 AF |
121 | @@ -8,7 +8,7 @@ |
122 | ||
123 | wtest_SOURCES = wtest.c | |
124 | ||
125 | -wtest_LDADD = $(top_builddir)/wmlib/libWMaker.a @XLFLAGS@ @XLIBS@ | |
126 | +wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@ | |
127 | ||
128 | ||
129 | INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib | |
cceea408 | 130 | diff -Naur WindowMaker-0.63.1/util/Makefile.am WindowMaker-0.63.1-p/util/Makefile.am |
260b62b4 | 131 | --- WindowMaker-0.63.1/util/Makefile.am Sun Jan 7 00:21:58 2001 |
cceea408 | 132 | +++ WindowMaker-0.63.1-p/util/Makefile.am Mon Jan 8 13:33:37 2001 |
260b62b4 | 133 | @@ -46,7 +46,7 @@ |
134 | @DLLIBS@ | |
5a1d6215 | 135 | |
136 | wmsetbg_LDADD = \ | |
137 | - $(top_builddir)/WINGs/libWINGs.a \ | |
138 | + $(top_builddir)/WINGs/libWINGs.la \ | |
139 | $(top_builddir)/wrlib/libwraster.la \ | |
5a1d6215 | 140 | @LIBPL@ \ |
260b62b4 | 141 | @DLLIBS@ |
cceea408 | 142 | diff -Naur WindowMaker-0.63.1/wmlib/Makefile.am WindowMaker-0.63.1-p/wmlib/Makefile.am |
260b62b4 | 143 | --- WindowMaker-0.63.1/wmlib/Makefile.am Sun Jan 7 00:21:58 2001 |
cceea408 | 144 | +++ WindowMaker-0.63.1-p/wmlib/Makefile.am Mon Jan 8 13:33:37 2001 |
32c7aa03 AF |
145 | @@ -1,13 +1,13 @@ |
146 | ||
147 | AUTOMAKE_OPTIONS = no-dependencies | |
148 | ||
149 | -lib_LIBRARIES = libWMaker.a | |
cceea408 | 150 | +lib_LTLIBRARIES = libWMaker.la |
32c7aa03 AF |
151 | |
152 | include_HEADERS = WMaker.h | |
153 | ||
260b62b4 | 154 | INCLUDES = $(DFLAGS) @XCFLAGS@ |
32c7aa03 AF |
155 | |
156 | -libWMaker_a_SOURCES = \ | |
157 | +libWMaker_la_SOURCES = \ | |
158 | menu.c \ | |
159 | app.c \ | |
160 | event.c \ | |
161 | @@ -15,3 +15,4 @@ | |
162 | app.h \ | |
163 | menu.h | |
164 | ||
165 | +libWMaker_la_LDFLAGS = -version-info 1:1:1 | |
cceea408 SZ |
166 | --- WindowMaker-0.63.1-p/util/Makefile.am Mon Jan 8 13:33:37 2001 |
167 | +++ WindowMaker-0.63.1/util/Makefile.am Mon Jan 8 13:58:25 2001 | |
168 | @@ -34,13 +34,13 @@ | |
169 | geticonset_LDADD= $(liblist) | |
170 | ||
171 | wmagnify_LDADD = \ | |
172 | - $(top_builddir)/WINGs/libWINGs.a \ | |
173 | + $(top_builddir)/WINGs/libWINGs.la \ | |
174 | $(top_builddir)/wrlib/libwraster.la \ | |
175 | @LIBPL@ \ | |
176 | @DLLIBS@ | |
177 | ||
178 | wmsetup_LDADD = \ | |
179 | - $(top_builddir)/WINGs/libWINGs.a \ | |
180 | + $(top_builddir)/WINGs/libWINGs.la \ | |
181 | $(top_builddir)/wrlib/libwraster.la \ | |
182 | @LIBPL@ \ | |
183 | @DLLIBS@ |