]>
Commit | Line | Data |
---|---|---|
0b559d78 | 1 | diff -aurN beast-0.5.4.orig/beast-gtk/gxk/Makefile.am beast-0.5.4/beast-gtk/gxk/Makefile.am |
2 | --- beast-0.5.4.orig/beast-gtk/gxk/Makefile.am 2003-03-31 12:09:33.000000000 +0200 | |
3 | +++ beast-0.5.4/beast-gtk/gxk/Makefile.am 2003-07-23 16:53:34.000000000 +0200 | |
4 | @@ -7,7 +7,7 @@ | |
df223619 | 5 | |
0b559d78 | 6 | INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/beast-gtk $(GXK_CFLAGS) # -I.. for <gxk/*.h> includes |
df223619 | 7 | |
0b559d78 | 8 | -DEFS += $(strip \ |
9 | +DEFS = $(strip \ | |
10 | -DGTK_DISABLE_COMPAT_H \ | |
11 | -DG_LOG_DOMAIN=\"GXK\" \ | |
12 | ) | |
13 | @@ -90,6 +90,6 @@ | |
14 | gxktest_SOURCES = gxktest.c | |
15 | gxktest_LDADD = $(progs_LDADD) | |
df223619 | 16 | |
0b559d78 | 17 | -EXTRA_DIST += $(gxk_headers) $(gxk_extra_sources) $(gxk_built_sources) |
18 | -MAINTAINERCLEANFILES += $(gxk_built_sources) $(stamp_files) | |
19 | -CLEANFILES += $(temp_files) | |
20 | +EXTRA_DIST = $(gxk_headers) $(gxk_extra_sources) $(gxk_built_sources) | |
21 | +MAINTAINERCLEANFILES = $(gxk_built_sources) $(stamp_files) | |
22 | +CLEANFILES = $(temp_files) | |
23 | diff -aurN beast-0.5.4.orig/beast-gtk/icons/Makefile.am beast-0.5.4/beast-gtk/icons/Makefile.am | |
24 | --- beast-0.5.4.orig/beast-gtk/icons/Makefile.am 2003-05-06 18:23:24.000000000 +0200 | |
25 | +++ beast-0.5.4/beast-gtk/icons/Makefile.am 2003-07-23 16:53:43.000000000 +0200 | |
26 | @@ -86,7 +86,7 @@ | |
27 | @STRIP_END@ | |
28 | ||
29 | gen_sources = xgen-bsgc xgen-bsgh | |
30 | -CLEANFILES += $(gen_sources) bst-stock-gen.c bst-stock-gen.h | |
31 | +CLEANFILES = $(gen_sources) bst-stock-gen.c bst-stock-gen.h | |
32 | noinst_DATA = bst-stock-gen.c bst-stock-gen.h | |
33 | EXTRA_DIST = $(SRC_IMAGES) $(filter-out STOCK_%, $(STOCK_IMAGE_DEFS)) | |
34 | ||
35 | diff -aurN beast-0.5.4.orig/beast-gtk/images/Makefile.am beast-0.5.4/beast-gtk/images/Makefile.am | |
36 | --- beast-0.5.4.orig/beast-gtk/images/Makefile.am 2003-04-13 17:09:13.000000000 +0200 | |
37 | +++ beast-0.5.4/beast-gtk/images/Makefile.am 2003-07-23 16:53:51.000000000 +0200 | |
38 | @@ -15,10 +15,10 @@ | |
39 | ||
40 | imagesdir = ${beastimagesdir} | |
41 | images_DATA = ${public_images} | |
42 | -EXTRA_DIST += ${public_images} ${private_images} | |
43 | +EXTRA_DIST = ${public_images} ${private_images} | |
44 | ||
45 | gen_sources = xgen-bstih | |
46 | -CLEANFILES += $(gen_sources) beast-images.h | |
47 | +CLEANFILES = $(gen_sources) beast-images.h | |
48 | noinst_DATA = beast-images.h | |
49 | ||
50 | beast-images.h: Makefile ${public_images} | |
51 | diff -aurN beast-0.5.4.orig/beast-gtk/Makefile.am beast-0.5.4/beast-gtk/Makefile.am | |
52 | --- beast-0.5.4.orig/beast-gtk/Makefile.am 2003-07-16 00:57:44.000000000 +0200 | |
53 | +++ beast-0.5.4/beast-gtk/Makefile.am 2003-07-23 16:53:25.000000000 +0200 | |
df223619 | 54 | @@ -9,14 +9,14 @@ |
55 | # -DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_COMPAT_H | |
56 | ||
57 | # we specify the logging domain here | |
58 | -DEFS += $(strip \ | |
59 | +DEFS = $(strip \ | |
60 | -DG_LOG_DOMAIN=\"BEAST\" \ | |
61 | ) | |
62 | ||
63 | # special profiling hooks | |
64 | PROFILE_SOURCE = # profile.c | |
65 | -CFLAGS += # $(subst profile.c, -pg -a, $(findstring profile.c, $(<F))) | |
66 | -LIBS += # -lefence # -pg | |
67 | +CFLAGS = # $(subst profile.c, -pg -a, $(findstring profile.c, $(<F))) | |
68 | +LIBS = # -lefence # -pg | |
69 | ||
70 | # link programs against BSE and other neccessary libraries | |
71 | progs_LDADD = $(strip \ | |
0b559d78 | 72 | @@ -95,7 +95,7 @@ |
df223619 | 73 | |
74 | ||
75 | # gen-sources | |
76 | -CLEANFILES += xgen-beac xgen-beac xgen-bgth xgen-bgtc xgen-belc xgen-bmh xgen-bmc xgen-bdkd | |
77 | +CLEANFILES = xgen-beac xgen-beac xgen-bgth xgen-bgtc xgen-belc xgen-bmh xgen-bmc xgen-bdkd | |
78 | bstenum_arrays.c: $(beast_headers) | |
79 | (cd ${srcdir} \ | |
80 | && $(GLIB_MKENUMS) \ | |
0b559d78 | 81 | @@ -184,15 +184,15 @@ |
df223619 | 82 | # extra deps |
83 | $(beast_SOURCES) $(bststest_SOURCES) $(tsmview_SOURCES): bstgentypes.h | |
84 | ||
85 | -EXTRA_DIST += $(beast_headers) $(beast_extra_sources) $(beast_extra_files) | |
86 | -MAINTAINERCLEANFILES += $(beast_built_sources) | |
87 | -EXTRA_DIST += $(beast_built_sources) | |
88 | +EXTRA_DIST = $(beast_headers) $(beast_extra_sources) $(beast_extra_files) | |
89 | +MAINTAINERCLEANFILES = $(beast_built_sources) | |
90 | +EXTRA_DIST = $(beast_built_sources) | |
91 | ||
92 | # | |
93 | # rules to generate built sources | |
94 | # | |
95 | gen_source = gen-source.tmp | |
96 | -CLEANFILES += $(gen_source) | |
97 | +CLEANFILES = $(gen_source) | |
98 | $(beast_sources): $(beast_built_sources) | |
99 | ||
100 | ||
0b559d78 | 101 | diff -aurN beast-0.5.4.orig/bse/icons/Makefile.am beast-0.5.4/bse/icons/Makefile.am |
102 | --- beast-0.5.4.orig/bse/icons/Makefile.am 2003-03-10 05:40:35.000000000 +0100 | |
103 | +++ beast-0.5.4/bse/icons/Makefile.am 2003-07-23 16:54:04.000000000 +0200 | |
104 | @@ -11,11 +11,11 @@ | |
105 | cd $(srcdir) \ | |
106 | && echo "## Generated data (by make $@)" > $@ \ | |
107 | && for f in $(icon_pattern) ; do \ | |
108 | - echo "icon_list += $$f" >>$@ ; \ | |
109 | + echo "icon_list = $$f" >>$@ ; \ | |
110 | done \ | |
111 | && echo "## Generated data ends here" >> $@ | |
df223619 | 112 | |
0b559d78 | 113 | -EXTRA_DIST += $(strip \ |
114 | +EXTRA_DIST = $(strip \ | |
115 | $(icon_list) \ | |
df223619 | 116 | ) |
df223619 | 117 | |
0b559d78 | 118 | @@ -29,4 +29,4 @@ |
119 | ##foo_la_LDFLAGS = -module -avoid-version | |
120 | ##foo_la_LIBADD = $(plugin_libs) | |
121 | ## | |
122 | -##plugin_LTLIBRARIES += foo.la | |
123 | +##plugin_LTLIBRARIES = foo.la | |
124 | diff -aurN beast-0.5.4.orig/bse/Makefile.am beast-0.5.4/bse/Makefile.am | |
125 | --- beast-0.5.4.orig/bse/Makefile.am 2003-06-08 17:57:29.000000000 +0200 | |
126 | +++ beast-0.5.4/bse/Makefile.am 2003-07-23 16:54:26.000000000 +0200 | |
df223619 | 127 | @@ -18,7 +18,7 @@ |
128 | # due to automake-1.3 not featuring target specific defines, | |
129 | # the G_LOG_DOMAIN needs to be special cased, depending on | |
130 | # the source file sets ;( | |
131 | -DEFS += $(strip \ | |
132 | +DEFS = $(strip \ | |
133 | $(patsubst %, -DG_LOG_DOMAIN=\"BSE\" -DBSE_COMPILATION, \ | |
134 | $(filter $(<F), $(bse_c_sources))) \ | |
135 | $(patsubst %, -DBSE_BUILTIN_NAME=$(strip $(subst -,_, $(subst .,_,$(basename $(<F))))) \ | |
136 | @@ -183,10 +183,10 @@ | |
137 | bse_h_sources = $(bse_private_h_sources) $(bse_public_h_sources) $(bse_built_h_sources) | |
138 | libbseinclude_HEADERS = $(bse_public_h_sources) $(bse_built_h_sources) | |
139 | libbse_la_SOURCES = $(bse_c_sources) $(bse_builtin_c_sources) | |
140 | -MAINTAINERCLEANFILES += $(bse_built_h_sources) $(bse_built_c_sources) | |
141 | -EXTRA_HEADERS += | |
142 | -EXTRA_DIST += $(bse_private_h_sources) $(bse_proc_sources) | |
143 | -EXTRA_DIST += $(bse_built_c_sources) $(bse_built_h_sources) $(bse_extra_sources) | |
144 | +MAINTAINERCLEANFILES = $(bse_built_h_sources) $(bse_built_c_sources) | |
145 | +EXTRA_HEADERS = | |
146 | +EXTRA_DIST = $(bse_private_h_sources) $(bse_proc_sources) | |
147 | +EXTRA_DIST = $(bse_built_c_sources) $(bse_built_h_sources) $(bse_extra_sources) | |
148 | GLIB_MKENUMS = glib-mkenums | |
149 | SFIDL = ../sfi/sfidl # WATCH OUT: $(SFIDL) works only for srcdir==builddir with cd $(srcdir) | |
150 | ||
151 | @@ -197,7 +197,7 @@ | |
152 | # setup autogeneration dependancies | |
153 | tmp_files = xgen-sbgth xgen-bgtc xgen-bgtac xgen-sbeac xgen-belc xgen-bbec xgen-bbac \ | |
154 | xgen-bnac xgen-bmx xgen-bmh xgen-bmc xgen-bgasi | |
155 | -CLEANFILES += $(tmp_files) @DVLBUILD@ $(bse_proc_gen_sources) | |
156 | +CLEANFILES = $(tmp_files) @DVLBUILD@ $(bse_proc_gen_sources) | |
157 | $(OBJECTS): $(bse_built_h_sources) | |
158 | # piggyback generation through sideeffects, needs NOP-rule for dep-tracking, must be in srcdir | |
159 | $(srcdir)/bsegentypes.h: @DVLBUILD@ stamp-bsegentypes.h ; | |
160 | @@ -272,7 +272,7 @@ | |
161 | && ./bseprocidl >> xgen-bgasi \ | |
162 | && (cmp -s xgen-bgasi bse.sfidl || cp xgen-bgasi bse.sfidl) \ | |
163 | && rm -f xgen-bgasi | |
164 | -CLEANFILES += bse.sfidl | |
165 | +CLEANFILES = bse.sfidl | |
166 | noinst_DATA = bse.sfidl | |
167 | ||
168 | ||
0b559d78 | 169 | diff -aurN beast-0.5.4.orig/bse/tests/Makefile.am beast-0.5.4/bse/tests/Makefile.am |
170 | --- beast-0.5.4.orig/bse/tests/Makefile.am 2003-05-20 18:17:40.000000000 +0200 | |
171 | +++ beast-0.5.4/bse/tests/Makefile.am 2003-07-23 16:54:09.000000000 +0200 | |
df223619 | 172 | @@ -5,9 +5,9 @@ |
173 | ||
174 | SUBDIRS = | |
175 | ||
176 | -INCLUDES += -I$(top_srcdir) -I$(top_builddir) $(SFI_CFLAGS) | |
177 | +INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(SFI_CFLAGS) | |
178 | ||
179 | -DEFS += -DG_LOG_DOMAIN=\"BSE-TEST\" # -DG_DISABLE_CONST_RETURNS | |
180 | +DEFS = -DG_LOG_DOMAIN=\"BSE-TEST\" # -DG_DISABLE_CONST_RETURNS | |
181 | ||
182 | ||
183 | TESTS = testwavechunk testfft | |
184 | @@ -26,5 +26,5 @@ | |
185 | mathtests_LDADD = $(progs_ldadd) | |
186 | ||
187 | ||
188 | -EXTRA_DIST += $(strip \ | |
189 | +EXTRA_DIST = $(strip \ | |
190 | ) | |
0b559d78 | 191 | diff -aurN beast-0.5.4.orig/bse/zintern/Makefile.am beast-0.5.4/bse/zintern/Makefile.am |
192 | --- beast-0.5.4.orig/bse/zintern/Makefile.am 2003-04-28 00:18:28.000000000 +0200 | |
193 | +++ beast-0.5.4/bse/zintern/Makefile.am 2003-07-23 16:54:19.000000000 +0200 | |
df223619 | 194 | @@ -10,7 +10,7 @@ |
195 | ) | |
196 | ||
197 | gen_sources = xgen-bzc xgen-bzh | |
198 | -CLEANFILES += $(gen_sources) bse-zfile.c bse-zfile.h | |
0b559d78 | 199 | +CLEANFILES = $(gen_sources) bse-zfile.c bse-zfile.h |
df223619 | 200 | noinst_DATA = bse-zfile.c # bse-zfile.h |
201 | EXTRA_DIST = $(filter-out BSE_%, $(ZFILE_DEFS)) | |
202 | ||
0b559d78 | 203 | diff -aurN beast-0.5.4.orig/bsw/Makefile.am beast-0.5.4/bsw/Makefile.am |
204 | --- beast-0.5.4.orig/bsw/Makefile.am 2003-03-10 10:03:15.000000000 +0100 | |
205 | +++ beast-0.5.4/bsw/Makefile.am 2003-07-23 16:54:31.000000000 +0200 | |
df223619 | 206 | @@ -15,7 +15,7 @@ |
207 | # due to automake-1.3 not featuring target specific defines, | |
208 | # the G_LOG_DOMAIN needs to be special cased, depending on | |
209 | # the source file sets ;( | |
210 | -DEFS += @STRIP_BEGIN@ \ | |
211 | +DEFS = @STRIP_BEGIN@ \ | |
212 | -DG_LOG_DOMAIN=\"BSW\" \ | |
213 | @STRIP_END@ | |
214 | ||
215 | @@ -66,10 +66,10 @@ | |
216 | bsw_h_sources = $(bsw_private_h_sources) $(bsw_public_h_sources) $(bsw_built_public_sources) | |
217 | libbswinclude_HEADERS = $(bsw_public_h_sources) $(bsw_built_public_sources) | |
218 | libbsw_la_SOURCES = $(bsw_c_sources) | |
219 | -CLEANFILES += $(bsw_built_public_sources) $(bsw_built_sources) | |
220 | -EXTRA_HEADERS += | |
221 | -EXTRA_DIST += $(bsw_private_h_sources) | |
222 | -EXTRA_DIST += $(bsw_built_sources) $(bsw_built_public_sources) $(bsw_extra_sources) | |
223 | +CLEANFILES = $(bsw_built_public_sources) $(bsw_built_sources) | |
224 | +EXTRA_HEADERS = | |
225 | +EXTRA_DIST = $(bsw_private_h_sources) | |
226 | +EXTRA_DIST = $(bsw_built_sources) $(bsw_built_public_sources) $(bsw_extra_sources) | |
227 | ||
228 | SFIDL = $(top_builddir)/sfi/sfidl | |
229 | ||
230 | @@ -78,7 +78,7 @@ | |
231 | # | |
232 | # setup autogeneration dependancies | |
233 | gen_sources = xgen-sbpah xgen-bpac | |
234 | -CLEANFILES += $(gen_sources) | |
235 | +CLEANFILES = $(gen_sources) | |
236 | # initial creation of the real stamp-* files | |
237 | bswgenapi.h: stamp-bswgenapi.h ; | |
238 | # normal autogeneration rules | |
239 | @@ -133,4 +133,4 @@ | |
240 | # | |
241 | # auxillary files | |
242 | # | |
243 | -EXTRA_DIST += # TODO | |
244 | +EXTRA_DIST = # TODO | |
0b559d78 | 245 | diff -aurN beast-0.5.4.orig/configure.in beast-0.5.4/configure.in |
246 | --- beast-0.5.4.orig/configure.in 2003-07-21 14:47:34.000000000 +0200 | |
247 | +++ beast-0.5.4/configure.in 2003-07-23 16:57:56.000000000 +0200 | |
df223619 | 248 | @@ -13,13 +13,13 @@ |
249 | # | |
250 | # BSE version numbers | |
251 | # | |
252 | -AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl | |
253 | +#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl | |
254 | BSE_MAJOR_VERSION=0 | |
255 | BSE_MINOR_VERSION=5 | |
0b559d78 | 256 | BSE_MICRO_VERSION=4 |
df223619 | 257 | BSE_INTERFACE_AGE=0 |
258 | BSE_BINARY_AGE=0 | |
259 | -AC_DIVERT_POP()dnl | |
260 | +#AC_DIVERT_POP()dnl | |
261 | dnl# | |
262 | dnl# Making releases: | |
263 | dnl# BSE_MICRO_VERSION += 1; | |
264 | @@ -57,13 +57,13 @@ | |
265 | ||
266 | dnl figure debugging default, prior to $ac_help setup | |
267 | dnl | |
268 | -AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl | |
269 | +#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl | |
270 | if test `expr $BSE_MINOR_VERSION \% 2 \| $BSE_MAJOR_VERSION \< 1` = 1 ; then | |
271 | debug_default=yes | |
272 | else | |
273 | debug_default=minimum | |
274 | fi | |
275 | -AC_DIVERT_POP()dnl | |
276 | +#AC_DIVERT_POP()dnl | |
277 | ||
278 | ||
279 | # initialize automake, don't define PACKAGE and VERSION | |
0b559d78 | 280 | diff -aurN beast-0.5.4.orig/docs/generated/Makefile.am beast-0.5.4/docs/generated/Makefile.am |
281 | --- beast-0.5.4.orig/docs/generated/Makefile.am 2003-07-11 02:20:01.000000000 +0200 | |
282 | +++ beast-0.5.4/docs/generated/Makefile.am 2003-07-23 16:54:40.000000000 +0200 | |
283 | @@ -49,7 +49,7 @@ | |
df223619 | 284 | |
285 | # extra dist | |
286 | build_tools = scandocs.pl | |
287 | -EXTRA_DIST += ${build_tools} | |
288 | +EXTRA_DIST = ${build_tools} | |
289 | ||
290 | # | |
291 | # reference docu generation | |
0b559d78 | 292 | @@ -175,8 +175,8 @@ |
df223619 | 293 | $(distdocs) \ |
294 | ) | |
295 | endif | |
296 | -CLEANFILES += $(conditional_clean) | |
297 | -EXTRA_DIST += $(distdocs) | |
298 | +CLEANFILES = $(conditional_clean) | |
299 | +EXTRA_DIST = $(distdocs) | |
300 | ||
301 | # | |
302 | # website generation | |
0b559d78 | 303 | @@ -231,7 +231,7 @@ |
df223619 | 304 | tar zxpf beast-site-nav.tar.gz -C $(BEAST_PREVIEW) |
305 | site-update: site-update-con | |
306 | site-upgrade: site-update-con site-update-img site-update-nav | |
307 | -CLEANFILES += beast-site-*.tar.gz beast-site-*.tar.bz2 index.html | |
308 | +CLEANFILES = beast-site-*.tar.gz beast-site-*.tar.bz2 index.html | |
309 | ||
310 | ||
311 | # | |
0b559d78 | 312 | @@ -249,7 +249,7 @@ |
df223619 | 313 | xmllint --noout --loaddtd --valid $$i ; \ |
314 | done | |
315 | ||
316 | -MAINTAINERCLEANFILES += | |
317 | +MAINTAINERCLEANFILES = | |
318 | ||
319 | # intermediate files we don't need to keep | |
320 | .INTERMEDIATE: $(strip \ | |
0b559d78 | 321 | diff -aurN beast-0.5.4.orig/Makefile.am beast-0.5.4/Makefile.am |
322 | --- beast-0.5.4.orig/Makefile.am 2003-04-04 18:06:46.000000000 +0200 | |
323 | +++ beast-0.5.4/Makefile.am 2003-07-23 16:53:10.000000000 +0200 | |
324 | @@ -40,13 +40,13 @@ | |
325 | # always built PKG_paths.h and create links | |
326 | stamp-h: PKG_paths.h | |
df223619 | 327 | |
0b559d78 | 328 | -CLEANFILES += PKG_paths.h |
329 | +CLEANFILES = PKG_paths.h | |
df223619 | 330 | |
0b559d78 | 331 | pkgconfigdir = $(libdir)/pkgconfig |
332 | pkgconfig_DATA = sfi.pc bse.pc | |
333 | $(pkgconfig_DATA): config.status | |
df223619 | 334 | |
0b559d78 | 335 | -EXTRA_DIST += $(strip \ |
336 | +EXTRA_DIST = $(strip \ | |
337 | TODO \ | |
338 | COPYING.GPL \ | |
339 | COPYING.LGPL \ | |
340 | diff -aurN beast-0.5.4.orig/plugins/freeverb/Makefile.am beast-0.5.4/plugins/freeverb/Makefile.am | |
341 | --- beast-0.5.4.orig/plugins/freeverb/Makefile.am 2003-03-10 05:41:12.000000000 +0100 | |
342 | +++ beast-0.5.4/plugins/freeverb/Makefile.am 2003-07-23 16:54:55.000000000 +0200 | |
df223619 | 343 | @@ -1,10 +1,10 @@ |
344 | # Freeverb Makefile | |
345 | # | |
346 | ||
347 | -CFLAGS += $(EXTRA_CFLAGS) | |
348 | -CPPFLAGS += $(EXTRA_CXXFLAGS) | |
349 | -INCLUDES += -I$(top_srcdir) -I. $(BSE_CFLAGS) -DG_LOG_DOMAIN=BSE_PLUGIN_NAME | |
350 | -INCLUDES += -DBSE_PLUGIN_FALLBACK="\"$(strip $(basename $(<F)))\"" | |
351 | +CFLAGS = $(EXTRA_CFLAGS) | |
352 | +CPPFLAGS = $(EXTRA_CXXFLAGS) | |
353 | +INCLUDES = -I$(top_srcdir) -I. $(BSE_CFLAGS) -DG_LOG_DOMAIN=BSE_PLUGIN_NAME | |
354 | +INCLUDES = -DBSE_PLUGIN_FALLBACK="\"$(strip $(basename $(<F)))\"" | |
355 | ||
356 | # install plugins under: | |
357 | plugindir = $(bseplugindir) | |
358 | @@ -18,7 +18,7 @@ | |
359 | ||
360 | plugin_LTLIBRARIES = freeverb.la | |
361 | ||
362 | -EXTRA_DIST += $(strip \ | |
363 | +EXTRA_DIST = $(strip \ | |
364 | bsefreeverb.h \ | |
365 | bsefreeverbcpp.h \ | |
366 | denormals.h \ | |
0b559d78 | 367 | diff -aurN beast-0.5.4.orig/plugins/icons/Makefile.am beast-0.5.4/plugins/icons/Makefile.am |
368 | --- beast-0.5.4.orig/plugins/icons/Makefile.am 2003-03-10 05:41:12.000000000 +0100 | |
369 | +++ beast-0.5.4/plugins/icons/Makefile.am 2003-07-23 16:55:05.000000000 +0200 | |
df223619 | 370 | @@ -11,11 +11,11 @@ |
371 | cd $(srcdir) \ | |
372 | && echo "## Generated data (by make $@)" > $@ \ | |
373 | && for f in $(icon_pattern) ; do \ | |
374 | - echo "icon_list += $$f" >>$@ ; \ | |
375 | + echo "icon_list = $$f" >>$@ ; \ | |
376 | done \ | |
377 | && echo "## Generated data ends here" >> $@ | |
378 | ||
379 | -EXTRA_DIST += $(strip \ | |
380 | +EXTRA_DIST = $(strip \ | |
381 | $(icon_list) \ | |
382 | ) | |
383 | ||
0b559d78 | 384 | @@ -29,4 +29,4 @@ |
385 | ##foo_la_LDFLAGS = -module -avoid-version | |
386 | ##foo_la_LIBADD = $(plugin_libs) | |
387 | ## | |
388 | -##plugin_LTLIBRARIES += foo.la | |
389 | +##plugin_LTLIBRARIES = foo.la | |
390 | diff -aurN beast-0.5.4.orig/plugins/Makefile.am beast-0.5.4/plugins/Makefile.am | |
391 | --- beast-0.5.4.orig/plugins/Makefile.am 2003-07-18 14:24:41.000000000 +0200 | |
392 | +++ beast-0.5.4/plugins/Makefile.am 2003-07-23 16:55:12.000000000 +0200 | |
393 | @@ -5,9 +5,9 @@ | |
394 | ||
395 | SUBDIRS = icons . freeverb | |
396 | ||
397 | -CFLAGS += $(EXTRA_CFLAGS) | |
398 | -INCLUDES += -I$(top_srcdir) -I. $(BSE_CFLAGS) -DG_LOG_DOMAIN=BSE_PLUGIN_NAME | |
399 | -INCLUDES += -DBSE_PLUGIN_FALLBACK="\"$(strip $(basename $(<F)))\"" | |
400 | +CFLAGS = $(EXTRA_CFLAGS) | |
401 | +INCLUDES = -I$(top_srcdir) -I. $(BSE_CFLAGS) -DG_LOG_DOMAIN=BSE_PLUGIN_NAME | |
402 | +INCLUDES = -DBSE_PLUGIN_FALLBACK="\"$(strip $(basename $(<F)))\"" | |
403 | GLIB_MKENUMS = glib-mkenums | |
404 | ||
405 | # install plugins under: | |
406 | @@ -45,7 +45,7 @@ | |
407 | Makefile.plugins: $(srcdir)/listplugins.sh $(PLUGIN_CFILES) Makefile.am | |
408 | $(srcdir)/listplugins.sh $(PLUGIN_CFILES) >$@ | |
409 | ||
410 | -EXTRA_DIST += $(strip \ | |
411 | +EXTRA_DIST = $(strip \ | |
412 | $(EXTRA_HEADERS) \ | |
413 | $(EXTRA_CFILES) \ | |
414 | $(plugins_built_sources) \ | |
415 | @@ -75,7 +75,7 @@ | |
416 | $< >> xgen-enums-$(@F) \ | |
417 | && cp xgen-enums-$(@F) $(@F) \ | |
418 | && rm -f xgen-enums-$(@F) | |
419 | -CLEANFILES += $(plugins_built_sources) xgen-enums-* | |
420 | +CLEANFILES = $(plugins_built_sources) xgen-enums-* | |
421 | ||
422 | ## include generated plugin Makefile | |
423 | include Makefile.plugins | |
424 | @@ -83,10 +83,10 @@ | |
425 | ## files in this directory, e.g. it'd list a given foo.c as: | |
426 | ## | |
427 | ##foo.enums: foo.h | |
428 | -##plugins_built_sources += foo.enums | |
429 | +##plugins_built_sources = foo.enums | |
430 | ##foo_la_SOURCES = foo.c | |
431 | ##foo_la_LDFLAGS = -module -avoid-version | |
432 | ##foo_la_LIBADD = $(plugin_libs) | |
433 | -##EXTRA_HEADERS += foo.h | |
434 | +##EXTRA_HEADERS = foo.h | |
435 | ## | |
436 | -##plugin_LTLIBRARIES += foo.la | |
437 | +##plugin_LTLIBRARIES = foo.la | |
438 | diff -aurN beast-0.5.4.orig/sfi/Makefile.am beast-0.5.4/sfi/Makefile.am | |
439 | --- beast-0.5.4.orig/sfi/Makefile.am 2003-07-05 02:46:17.000000000 +0200 | |
440 | +++ beast-0.5.4/sfi/Makefile.am 2003-07-23 16:55:20.000000000 +0200 | |
df223619 | 441 | @@ -5,13 +5,13 @@ |
442 | ||
443 | SUBDIRS = | |
444 | ||
445 | -INCLUDES += -I$(top_srcdir) -I$(top_builddir) $(SFI_CFLAGS) | |
446 | +INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(SFI_CFLAGS) | |
447 | ||
448 | # supported defines: SFI_DISABLE_DEBUG | |
449 | ||
450 | # public libraries | |
451 | lib_LTLIBRARIES = libsfi.la | |
452 | -DEFS += -DG_LOG_DOMAIN=\"SFI\" -DG_DISABLE_CONST_RETURNS | |
453 | +DEFS = -DG_LOG_DOMAIN=\"SFI\" -DG_DISABLE_CONST_RETURNS | |
454 | libsfiincludedir = $(includedir)/sfi | |
455 | libsfi_la_LDFLAGS = $(strip \ | |
456 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ | |
457 | @@ -54,15 +54,15 @@ | |
458 | # | |
459 | SFIDL = $(top_builddir)/sfi/sfidl | |
460 | temp_files = xgen-tih xgen-tic xgen-sch | |
461 | -CLEANFILES += $(temp_files) | |
462 | -CLEANFILES += testidl.h testidl.c | |
463 | +CLEANFILES = $(temp_files) | |
464 | +CLEANFILES = testidl.h testidl.c | |
465 | testidl.h: $(srcdir)/testidl.sfidl sfidl | |
466 | $(SFIDL) --header --implementation --boxed $(srcdir)/testidl.sfidl > xgen-tih \ | |
467 | && mv xgen-tih testidl.h | |
468 | testidl.c: $(srcdir)/testidl.sfidl sfidl | |
469 | $(SFIDL) --source --implementation --boxed --init test_types_init $(srcdir)/testidl.sfidl > xgen-tic \ | |
470 | && mv xgen-tic testidl.c | |
471 | -EXTRA_DIST += testidl.sfidl | |
472 | +EXTRA_DIST = testidl.sfidl | |
473 | ||
474 | sficonfig.h: $(top_builddir)/config.status Makefile | |
475 | echo "/* Generated data from $< (by make $@) */" > xgen-sch \ | |
476 | @@ -76,7 +76,7 @@ | |
477 | && echo "/* Generated data ends here */" >> xgen-sch \ | |
478 | && (cmp -s xgen-sch $@ || cp xgen-sch $@) \ | |
479 | && rm -f xgen-sch | |
480 | -CLEANFILES += sficonfig.h xgen-sch | |
481 | +CLEANFILES = sficonfig.h xgen-sch | |
482 | $(srcdir)/sfithreads.c: sficonfig.h | |
483 | $(OBJECTS): sficonfig.h | |
484 | ||
485 | @@ -86,8 +86,8 @@ | |
486 | noinst_PROGRAMS = sfidl testsfi | |
487 | # source files | |
488 | sfidl_SOURCES = sfidl.cc sfidl-namespace.cc sfidl-options.cc sfidl-parser.cc glib-extra.c | |
489 | -EXTRA_DIST += sfidl-namespace.h sfidl-options.h sfidl-parser.h | |
490 | -progs_extra_sources += sfidl-namespace.h | |
491 | +EXTRA_DIST = sfidl-namespace.h sfidl-options.h sfidl-parser.h | |
492 | +progs_extra_sources = sfidl-namespace.h | |
493 | sfidl_LDADD = $(SFI_LIBS) -lm | |
494 | testsfi_SOURCES = testsfi.c | |
495 | testsfi_LDADD = libsfi.la | |
496 | @@ -103,8 +103,8 @@ | |
497 | # | |
498 | TOYPROF_H_SOURCES = toyprof.h toyprof-mem.h | |
499 | TOYPROF_C_SOURCES = toyprof.c toyprof-mem.c | |
500 | -EXTRA_DIST += toyprof.pl toyprof.README $(TOYPROF_H_SOURCES) | |
501 | +EXTRA_DIST = toyprof.pl toyprof.README $(TOYPROF_H_SOURCES) | |
502 | ||
503 | ||
504 | -EXTRA_DIST += $(sfi_public_headers) $(sfi_extra_sources) $(progs_extra_sources) $(sfi_built_sources) | |
505 | -MAINTAINERCLEANFILES += $(sfi_built_sources) | |
506 | +EXTRA_DIST = $(sfi_public_headers) $(sfi_extra_sources) $(progs_extra_sources) $(sfi_built_sources) | |
507 | +MAINTAINERCLEANFILES = $(sfi_built_sources) | |
0b559d78 | 508 | diff -aurN beast-0.5.4.orig/shell/Makefile.am beast-0.5.4/shell/Makefile.am |
509 | --- beast-0.5.4.orig/shell/Makefile.am 2003-06-17 04:29:58.000000000 +0200 | |
510 | +++ beast-0.5.4/shell/Makefile.am 2003-07-23 16:55:27.000000000 +0200 | |
df223619 | 511 | @@ -9,11 +9,11 @@ |
512 | # built sources | |
513 | # | |
514 | built_sources = # bsescm-genglue.c | |
515 | -MAINTAINERCLEANFILES += $(built_sources) | |
516 | -EXTRA_DIST += $(built_sources) | |
517 | +MAINTAINERCLEANFILES = $(built_sources) | |
518 | +EXTRA_DIST = $(built_sources) | |
519 | # temporary build files | |
520 | gen_sources = xgen-bsggc | |
521 | -CLEANFILES += $(gen_sources) | |
522 | +CLEANFILES = $(gen_sources) | |
523 | ||
524 | # | |
525 | # programs to build | |
526 | @@ -25,7 +25,7 @@ | |
527 | bsesh_SOURCES = bsesh.c bsescminterp.c cxxdummy.cc | |
528 | bsesh_LDADD = $(programs_ldadd) $(BSE_SHELL_LIBS) | |
529 | bsescminterp.c: # bsescm-genglue.c | |
530 | -EXTRA_DIST += bsescminterp.h | |
531 | +EXTRA_DIST = bsescminterp.h | |
532 | ||
533 | ||
534 | # | |
535 | @@ -38,4 +38,4 @@ | |
536 | progressor-example.scm \ | |
537 | modules2grid.scm \ | |
538 | ) | |
539 | -EXTRA_DIST += $(public_scripts) test.scm | |
540 | +EXTRA_DIST = $(public_scripts) test.scm |