[packages/beast.git] / beast-ac.patch

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