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