GNOME.org
 

[beast/temp-rc1] BUILD: preserve AM_LDFLAGS, AM_CXXFLAGS and AM_CFLAGS in Makefiles

commit 21dd310ed3312ee7d640ee9c05f2c624162a59ee
Author: Tim Janik <timj gnu org>
Date:   Fri Oct 17 03:37:45 2014 +0200

    BUILD: preserve AM_LDFLAGS, AM_CXXFLAGS and AM_CFLAGS in Makefiles

 Makefile.am                       |    2 +-
 Makefile.decl                     |    4 ++--
 beast-gtk/Makefile.am             |    2 +-
 beast-gtk/gxk/Makefile.am         |    4 ++--
 bse/Makefile.am                   |    3 ++-
 bse/tests/Makefile.am             |    2 +-
 drivers/Makefile.am               |    6 +++---
 drivers/bse-portaudio/Makefile.am |    4 ++--
 launchers/Makefile.am             |    2 +-
 plugins/Makefile.am               |   14 +++++++-------
 plugins/evaluator/Makefile.am     |    2 +-
 plugins/freeverb/Makefile.am      |    4 ++--
 sfi/Makefile.am                   |    4 ++--
 sfi/tests/Makefile.am             |    2 +-
 shell/Makefile.am                 |    2 +-
 tests/Makefile.am                 |    4 ++--
 tests/bse/Makefile.am             |    4 ++--
 tests/filecheck/Makefile.am       |    2 +-
 tests/latency/Makefile.am         |    4 ++--
 tools/Makefile.am                 |    2 +-
 20 files changed, 37 insertions(+), 36 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index fa67336..d5bb7e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ noinst_DATA =
 
 # require automake 1.9
 AUTOMAKE_OPTIONS = 1.9 dist-bzip2 no-dist-gzip -Wno-portability
-ACLOCAL_AMFLAGS = -I autotools
+ACLOCAL_AMFLAGS  = -I autotools
 
 site site-preview site-update site-update-all site-update-pages site-update-galleries:
        @$(MAKE) -C web/ $(AM_MAKEFLAGS) $@
diff --git a/Makefile.decl b/Makefile.decl
index 1c11f8d..1b1e44a 100644
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -19,8 +19,8 @@ QGEN    = $(Q:@= echo '  GEN   ' $@; )
 QSTDERR = $(Q:@=2>/dev/null)
 
 # assign project wide defaults
-AM_CFLAGS = -D_BIRNET_SOURCE_EXTENSIONS
-AM_CXXFLAGS = -D_BIRNET_SOURCE_EXTENSIONS
+AM_CFLAGS   += -D_BIRNET_SOURCE_EXTENSIONS
+AM_CXXFLAGS += -D_BIRNET_SOURCE_EXTENSIONS
 
 # == download ==
 # recursive rule supported by all Makefiles to download files hosted online
diff --git a/beast-gtk/Makefile.am b/beast-gtk/Makefile.am
index e90168a..de9a7e7 100644
--- a/beast-gtk/Makefile.am
+++ b/beast-gtk/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = gxk dialogs icons
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"BEAST\""
-AM_CXXFLAGS  = $(BEAST_CFLAGS) $(GXK_CFLAGS) $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE \
+AM_CXXFLAGS += $(BEAST_CFLAGS) $(GXK_CFLAGS) $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE \
                        -DG_DISABLE_CONST_RETURNS -DGTK_ENABLE_BROKEN # -DGTK_DISABLE_DEPRECATED 
-DGTK_DISABLE_COMPAT_H
 
 
diff --git a/beast-gtk/gxk/Makefile.am b/beast-gtk/gxk/Makefile.am
index 6697303..d809345 100644
--- a/beast-gtk/gxk/Makefile.am
+++ b/beast-gtk/gxk/Makefile.am
@@ -5,8 +5,8 @@ SUBDIRS =
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/beast-gtk -I$(top_builddir)/beast-gtk 
-I$(srcdir) # -I.. for <gxk/*.h> includes
 DEFS        += @DEFINE__FILE_DIR__@ -DGTK_DISABLE_COMPAT_H -DGXK_COMPILATION -DG_LOG_DOMAIN=\"GXK\" # 
-DGTK_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS -DGTK_ENABLE_BROKEN
-AM_CXXFLAGS  = $(GXK_CFLAGS) $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
-AM_CFLAGS    = $(GXK_CFLAGS)
+AM_CXXFLAGS += $(GXK_CFLAGS) $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
+AM_CFLAGS   += $(GXK_CFLAGS)
 
 noinst_LIBRARIES = libgxk.a
 
diff --git a/bse/Makefile.am b/bse/Makefile.am
index 7ae3d8c..36e7cb8 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -12,7 +12,7 @@ DEFS     += @DEFINE__FILE_DIR__@ $(strip \
        $(patsubst %, -DG_LOG_DOMAIN=\"BSE\" -DBSE_COMPILATION, \
                      $(filter $(<F), $(bse_sources) $(bse_sources))) \
 )
-AM_CXXFLAGS  = $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE -DG_DISABLE_DEPRECATED 
-DG_DISABLE_CONST_RETURNS
+AM_CXXFLAGS  += $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE -DG_DISABLE_DEPRECATED 
-DG_DISABLE_CONST_RETURNS
 AIDACC_VDEBUG = $(AIDACC) $(if $(findstring 1, $(V)), --aida-debug)
 
 #
@@ -150,6 +150,7 @@ libbse_la_LDFLAGS            = $(strip                              \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
        -release $(LT_RELEASE)                                  \
        -no-undefined                                           \
+       $(AM_LDFLAGS)                                           \
        $(call pthread_2_lpthread, $(BSE_LIBS) $(SFI_LIBS))     \
 )
 EXTRA_DIST += ldscript.map
diff --git a/bse/tests/Makefile.am b/bse/tests/Makefile.am
index f570b14..93d3142 100644
--- a/bse/tests/Makefile.am
+++ b/bse/tests/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir)
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN=\"BSE-TEST\" # -DG_DISABLE_CONST_RETURNS
-AM_CXXFLAGS  = $(BSE_CFLAGS) $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
+AM_CXXFLAGS += $(BSE_CFLAGS) $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 EXTRA_DIST += arrows.gp filter-defs.gp
 
diff --git a/drivers/Makefile.am b/drivers/Makefile.am
index 4014636..a514b08 100644
--- a/drivers/Makefile.am
+++ b/drivers/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 INCLUDES    += -I$(top_srcdir) -I.
 DEFS        += @DEFINE__FILE_DIR__@ $(strip -DG_LOG_DOMAIN=\"BSE-ALSA\")
-AM_CXXFLAGS  = $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
+AM_CXXFLAGS += $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 # Plugin bsedevice-alsa
 driversdir          = $(bsedriverdir)
@@ -14,12 +14,12 @@ EXTRA_DIST=
 
 # Plugin bsepcmdevice-alsa
 bsepcmdevice_alsa_la_SOURCES = bsepcmdevice-alsa.cc
-bsepcmdevice_alsa_la_LDFLAGS = -module $(drivers_ldflags)
+bsepcmdevice_alsa_la_LDFLAGS = $(AM_LDFLAGS) -module $(drivers_ldflags)
 bsepcmdevice_alsa_la_LIBADD  = $(drivers_libs) $(ALSA_LIBS)
 EXTRA_DIST                  += bsepcmdevice-alsa.hh
 
 # Plugin bsemididevice-alsa
 bsemididevice_alsa_la_SOURCES = bsemididevice-alsa.cc
-bsemididevice_alsa_la_LDFLAGS = -module $(drivers_ldflags)
+bsemididevice_alsa_la_LDFLAGS = $(AM_LDFLAGS) -module $(drivers_ldflags)
 bsemididevice_alsa_la_LIBADD  = $(drivers_libs) $(ALSA_LIBS)
 EXTRA_DIST                   += bsemididevice-alsa.hh
diff --git a/drivers/bse-portaudio/Makefile.am b/drivers/bse-portaudio/Makefile.am
index 17da4ad..ca388f5 100644
--- a/drivers/bse-portaudio/Makefile.am
+++ b/drivers/bse-portaudio/Makefile.am
@@ -2,7 +2,7 @@
 
 INCLUDES    += -I$(srcdir) -I$(top_builddir)
 DEFS        += @DEFINE__FILE_DIR__@ $(strip -DG_LOG_DOMAIN=\"BSE-PortAudio\")
-AM_CXXFLAGS  = $(BSE_CFLAGS)
+AM_CXXFLAGS += $(BSE_CFLAGS)
 
 # make automake1.9 happy
 EXTRA_DIST =
@@ -21,7 +21,7 @@ drivers_LTLIBRARIES = bsepcmdevice-portaudio.la
 ## Plugin bsepcmdevice-portaudio
 ##
 bsepcmdevice_portaudio_la_SOURCES = bsepcmdevice-portaudio.cc
-bsepcmdevice_portaudio_la_LDFLAGS = -module $(drivers_ldflags)
+bsepcmdevice_portaudio_la_LDFLAGS = $(AM_LDFLAGS) -module $(drivers_ldflags)
 bsepcmdevice_portaudio_la_LIBADD  = $(drivers_libs) $(PORTAUDIO_LIBS)
 EXTRA_DIST                       += bsepcmdevice-portaudio.hh
 
diff --git a/launchers/Makefile.am b/launchers/Makefile.am
index 6360ebd..c1bc26b 100644
--- a/launchers/Makefile.am
+++ b/launchers/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I.
 DEFS        += @DEFINE__FILE_DIR__@ -DBINDIR=\"$(bindir)\"
-AM_CXXFLAGS  = $(LAUNCHER_CFLAGS) -DG_DISABLE_CONST_RETURNS
+AM_CXXFLAGS += $(LAUNCHER_CFLAGS) -DG_DISABLE_CONST_RETURNS
 
 #
 # programs to build
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 132516e..4af2d1b 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = icons . freeverb # evaluator
 
 INCLUDES    += -I$(top_srcdir) -I.
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"$(strip $(basename $(<F)))\""
-AM_CXXFLAGS  = $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE -D_BIRNET_SOURCE_EXTENSIONS
+AM_CXXFLAGS += $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE -D_BIRNET_SOURCE_EXTENSIONS
 
 # == IDL C++ Plugins ==
 idl_plugins = $(strip                  \
@@ -38,12 +38,12 @@ cxx_plugin_sources = bseadder.cc bseatandistort.cc bsesimpleadsr.cc bsemixer.cc
 cxx_plugin_extra   = bsesimpleadsr-aux.cc
 EXTRA_DIST        += $(cxx_plugin_headers) $(cxx_plugin_extra)
 cxxplugins_FPU_la_SOURCES  = $(cxx_plugin_sources)
-cxxplugins_FPU_la_LDFLAGS  = -module $(plugins_ldflags)
+cxxplugins_FPU_la_LDFLAGS  = $(AM_LDFLAGS) -module $(plugins_ldflags)
 cxxplugins_FPU_la_LIBADD   = $(plugins_libs)
 cxxplugins_FPU_la_CFLAGS   = $(FPU_PLUGIN_CFLAGS)
 cxxplugins_FPU_la_CXXFLAGS = $(FPU_PLUGIN_CXXFLAGS)
 cxxplugins_SSE_la_SOURCES  = $(cxx_plugin_sources)
-cxxplugins_SSE_la_LDFLAGS  = -module $(plugins_ldflags)
+cxxplugins_SSE_la_LDFLAGS  = $(AM_LDFLAGS) -module $(plugins_ldflags)
 cxxplugins_SSE_la_LIBADD   = $(plugins_libs)
 cxxplugins_SSE_la_CFLAGS   = $(SSE_PLUGIN_CFLAGS)
 cxxplugins_SSE_la_CXXFLAGS = $(SSE_PLUGIN_CXXFLAGS)
@@ -80,7 +80,7 @@ endif
 # === CoreHook plugin ===
 plugin_SSE_ltlibs            += bseblockutils.SSE.la
 bseblockutils_SSE_la_SOURCES  = bseblockutils.cc
-bseblockutils_SSE_la_LDFLAGS  = -module $(plugins_ldflags)
+bseblockutils_SSE_la_LDFLAGS  = $(AM_LDFLAGS) -module $(plugins_ldflags)
 bseblockutils_SSE_la_LIBADD   = $(plugins_libs)
 bseblockutils_SSE_la_CXXFLAGS = $(SSE_PLUGIN_CXXFLAGS)
 
@@ -92,7 +92,7 @@ include Makefile.plugins
 ##plugins_built_sources += bsefoo.genidl.hh
 ##plugin_FPU_ltlibs     += bsefoo.FPU.la
 ##bsefoo_FPU_la_SOURCES  = bsefoo.cc
-##bsefoo_FPU_la_LDFLAGS  = -module $(plugins_ldflags)
+##bsefoo_FPU_la_LDFLAGS  = $(AM_LDFLAGS) -module $(plugins_ldflags)
 ##bsefoo_FPU_la_LIBADD   = $(plugins_libs)
 ##bsefoo_FPU_la_CXXFLAGS = $(FPU_PLUGIN_CXXFLAGS)
 .PHONY: refresh-Makefile.plugins
@@ -107,12 +107,12 @@ refresh-Makefile.plugins: Makefile.am Makefile.in Makefile
            echo "plugin_FPU_ltlibs          += $$libname.FPU.la"                 >>xgen-$(@F)  ;\
            echo "$$libname"'_FPU_la_SOURCES  ='                                  >>xgen-$(@F)  ;\
            echo "$$libname"'_FPU_la_CXXFLAGS = $$(FPU_PLUGIN_CXXFLAGS)'          >>xgen-$(@F)  ;\
-           echo "$$libname"'_FPU_la_LDFLAGS  = -module $$(plugins_ldflags)'      >>xgen-$(@F)  ;\
+           echo "$$libname"'_FPU_la_LDFLAGS  = $$(AM_LDFLAGS) -module $$(plugins_ldflags)'       

xgen-$(@F)  ;\

            echo "$$libname"'_FPU_la_LIBADD   = $$(plugins_libs)'                 >>xgen-$(@F)  ;\
            echo "plugin_SSE_ltlibs          += $$libname.SSE.la"                 >>xgen-$(@F)  ;\
            echo "$$libname"'_SSE_la_SOURCES  = $$('"$$libname"'_FPU_la_SOURCES)' >>xgen-$(@F)  ;\
            echo "$$libname"'_SSE_la_CXXFLAGS = $$(SSE_PLUGIN_CXXFLAGS)'          >>xgen-$(@F)  ;\
-           echo "$$libname"'_SSE_la_LDFLAGS  = $$('"$$libname"'_FPU_la_LDFLAGS)' >>xgen-$(@F)  ;\
+           echo "$$libname"'_SSE_la_LDFLAGS  = $$(AM_LDFLAGS) $$('"$$libname"'_FPU_la_LDFLAGS)' >>xgen-$(@F) 
  ;\
            echo "$$libname"'_SSE_la_LIBADD   = $$('"$$libname"'_FPU_la_LIBADD)'  >>xgen-$(@F)  ;\
            continue                                                                            ;\
          }                                                                                     ;\
diff --git a/plugins/evaluator/Makefile.am b/plugins/evaluator/Makefile.am
index fed967c..f7ebfbe 100644
--- a/plugins/evaluator/Makefile.am
+++ b/plugins/evaluator/Makefile.am
@@ -27,7 +27,7 @@ include $(top_srcdir)/Makefile.decl
 #EVALUATE_SOURCES = instruction.cc compiler.cc cpu.cc
 #
 #bseevaluator_la_SOURCES = bseevaluator.cc $(EVALUATE_SOURCES)
-#bseevaluator_la_LDFLAGS = -module -avoid-version
+#bseevaluator_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
 #bseevaluator_la_LIBADD  = $(top_builddir)/bse/libbse.la $(top_builddir)/sfi/libsfi.la $(BSE_LIBS) -lm
 #plugins_built_sources += bseevaluator.genidl.hh
 #EXTRA_HEADERS += bseevaluator.idl symbols.hh token.hh instruction.hh compiler.hh cpu.hh
diff --git a/plugins/freeverb/Makefile.am b/plugins/freeverb/Makefile.am
index 384284e..9960d52 100644
--- a/plugins/freeverb/Makefile.am
+++ b/plugins/freeverb/Makefile.am
@@ -3,13 +3,13 @@ include $(top_srcdir)/Makefile.decl
 
 INCLUDES    += -I$(top_srcdir) -I.
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"$(strip $(basename $(<F)))\""
-AM_CXXFLAGS  = $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
+AM_CXXFLAGS += $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 # install plugins under:
 plugindir = $(bseplugindir)
 
 freeverb_la_SOURCES = allpass.cpp comb.cpp revmodel.cpp bsefreeverbcpp.cpp bsefreeverb.cc
-freeverb_la_LDFLAGS = -module -avoid-version
+freeverb_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
 freeverb_la_LIBADD  = $(top_builddir)/bse/libbse.la $(BSE_LIBS) -lm
 
 plugin_LTLIBRARIES = freeverb.la
diff --git a/sfi/Makefile.am b/sfi/Makefile.am
index 1a87a91..37670d6 100644
--- a/sfi/Makefile.am
+++ b/sfi/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 SUBDIRS   = . tests
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir) $(SFI_CFLAGS)
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN=\"SFI\" -DG_DISABLE_CONST_RETURNS
-AM_CXXFLAGS  = $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
+AM_CXXFLAGS += $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 sfi_public_headers = $(strip \
        sfistore.hh     sficomwire.hh   sfifilecrawler.hh \
@@ -37,7 +37,7 @@ noinst_LTLIBRARIES    = libsfi.la
 libsfiincludedir      = $(includedir)/sfi
 libsfiinclude_HEADERS = $(sfi_public_headers)
 libsfi_la_SOURCES     = $(sfi_all_sources)
-libsfi_la_LDFLAGS     = -no-undefined # -Wl,-Bsymbolic
+libsfi_la_LDFLAGS     = $(AM_LDFLAGS) -no-undefined # -Wl,-Bsymbolic
 libsfi_la_LIBADD      = $(SFI_LIBS) -lm
 
 #
diff --git a/sfi/tests/Makefile.am b/sfi/tests/Makefile.am
index 1b0eafb..f265207 100644
--- a/sfi/tests/Makefile.am
+++ b/sfi/tests/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I.
 DEFS       += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN='"$(basename $(@F))"' -DPARANOID # 
-DG_DISABLE_CONST_RETURNS
-AM_CXXFLAGS  = $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
+AM_CXXFLAGS += $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 noinst_PROGRAMS   = $(ALLTESTS)
 progs_nosfi_ldadd = $(RAPICORN_LIBS) $(SFI_LIBS) -lm
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 5230818..1473d48 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -6,7 +6,7 @@ DEFS += @DEFINE__FILE_DIR__@ $(strip                            \
        -DG_LOG_DOMAIN=\"BSESCM\"       \
        $(SUIDMAIN_DEFS)                \
 )
-AM_CXXFLAGS  = $(BSESCM_CFLAGS) $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE 
-DG_DISABLE_CONST_RETURNS
+AM_CXXFLAGS += $(BSESCM_CFLAGS) $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE 
-DG_DISABLE_CONST_RETURNS
 
 #
 # built sources
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0131dfb..9baa5a1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,8 +5,8 @@ SUBDIRS = . latency scripts bse audio filecheck
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"BEAST-TEST\"" # -DG_DISABLE_CONST_RETURNS
-AM_CXXFLAGS  = $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
-AM_CFLAGS    = $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
+AM_CXXFLAGS += $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
+AM_CFLAGS   += $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 SFIDL = $(top_builddir)/sfi/sfidl
 SFIDL_INC = --nostdinc -I$(top_srcdir) -I$(top_builddir)
diff --git a/tests/bse/Makefile.am b/tests/bse/Makefile.am
index b7970c4..02011f4 100644
--- a/tests/bse/Makefile.am
+++ b/tests/bse/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"BSE-TEST\"" # -DG_DISABLE_CONST_RETURNS
-AM_CXXFLAGS  = $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
+AM_CXXFLAGS += $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 SFIDL = $(top_builddir)/sfi/sfidl
 SFIDL_INC = --nostdinc -I$(top_srcdir) -I$(top_builddir)
@@ -64,7 +64,7 @@ EXTRA_DIST += empty.ogg
 #
 lib_LTLIBRARIES = testplugin.la
 testplugin_la_SOURCES = testplugin.cc
-testplugin_la_LDFLAGS = -module -avoid-version
+testplugin_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
 testplugin_la_LIBADD  = $(top_builddir)/bse/libbse.la $(RAPICORN_LIBS) $(BSE_LIBS) -lm
 EXTRA_DIST += testplugin.idl
 GENERATED_CLEANFILES += testplugin.genidl.hh
diff --git a/tests/filecheck/Makefile.am b/tests/filecheck/Makefile.am
index b9a09af..1747a5e 100644
--- a/tests/filecheck/Makefile.am
+++ b/tests/filecheck/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir)
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"BEAST-TEST\"" # -DG_DISABLE_CONST_RETURNS
-AM_CXXFLAGS  = $(SFI_CFLAGS)
+AM_CXXFLAGS += $(SFI_CFLAGS)
 
 SFIDL = $(top_builddir)/sfi/sfidl
 SFIDL_INC = --nostdinc -I$(top_srcdir) -I$(top_builddir)
diff --git a/tests/latency/Makefile.am b/tests/latency/Makefile.am
index b3ad587..87e618e 100644
--- a/tests/latency/Makefile.am
+++ b/tests/latency/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"BSE-TEST\"" # -DG_DISABLE_CONST_RETURNS
-AM_CXXFLAGS  = $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
+AM_CXXFLAGS += $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 # IDL Compiler
 SFIDL     = $(top_builddir)/sfi/sfidl
@@ -19,7 +19,7 @@ BSESCM    = $(top_builddir)/shell/bsescm-$(BIN_VERSION)
 #
 # bselatencytest:
 bselatencytest_la_SOURCES = bselatencytest.cc
-bselatencytest_la_LDFLAGS = -module -avoid-version
+bselatencytest_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
 bselatencytest_la_LIBADD  = $(top_builddir)/bse/libbse.la $(RAPICORN_LIBS) $(BSE_LIBS) -lm
 EXTRA_HEADERS += bselatencytest.idl
 $(srcdir)/bselatencytest.cc: bselatencytest.idl
diff --git a/tools/Makefile.am b/tools/Makefile.am
index b7dc10f..b7527ba 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = . scripts
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir)
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN=\"BSE-TOOLS\" -DG_DISABLE_CONST_RETURNS
-AM_CXXFLAGS  = $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
+AM_CXXFLAGS += $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 noinst_PROGRAMS = $(ALLTESTS)
 progs_ldadd     = $(top_builddir)/bse/libbse.la $(RAPICORN_LIBS) $(BSE_LIBS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]