[beast/devel: 2/12] BUILD: clean up INCLUDES, DEFS, AM_CXXFLAGS, link against librapicorn

From: Tim Janik <timj src gnome org>
To: commits-list gnome org
Cc:
Subject: [beast/devel: 2/12] BUILD: clean up INCLUDES, DEFS, AM_CXXFLAGS, link against librapicorn
Date: Wed, 20 Mar 2013 05:03:20 +0000 (UTC)
commit b20531436fc7eaddaae8400470c194e522601600
Author: Tim Janik <timj gnu org>
Date:   Sun Feb 24 04:39:43 2013 +0100

    BUILD: clean up INCLUDES, DEFS, AM_CXXFLAGS, link against librapicorn

 beast-gtk/Makefile.am             |    8 ++++----
 beast-gtk/gxk/Makefile.am         |   12 ++++--------
 birnet/Makefile.am                |    5 +++--
 birnet/birnetcdefs.h              |    6 +++---
 birnet/birnetutils.hh             |    7 ++++---
 birnet/tests/Makefile.am          |    5 +++--
 bse/Makefile.am                   |    3 ++-
 bse/tests/Makefile.am             |    6 +++---
 bse/zintern/Makefile.am           |    3 ++-
 drivers/Makefile.am               |    5 +++--
 drivers/bse-portaudio/Makefile.am |    7 ++++---
 launchers/Makefile.am             |    8 +++-----
 plugins/Makefile.am               |    4 +++-
 plugins/freeverb/Makefile.am      |    4 +++-
 sfi/Makefile.am                   |    5 +++--
 sfi/tests/Makefile.am             |    5 +++--
 shell/Makefile.am                 |    4 ++--
 tests/Makefile.am                 |    7 +++++--
 tests/bse/Makefile.am             |    6 ++++--
 tests/filecheck/Makefile.am       |    6 ++++--
 tests/latency/Makefile.am         |    6 ++++--
 tools/Makefile.am                 |    5 +++--
 22 files changed, 72 insertions(+), 55 deletions(-)
---
diff --git a/beast-gtk/Makefile.am b/beast-gtk/Makefile.am
index 090e83b..3e877b3 100644
--- a/beast-gtk/Makefile.am
+++ b/beast-gtk/Makefile.am
@@ -3,11 +3,11 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = gxk dialogs icons
 
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BEAST_CFLAGS) -DG_DISABLE_CONST_RETURNS 
-DGTK_ENABLE_BROKEN
-# -DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_COMPAT_H
+INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
+DEFS        += -DG_LOG_DOMAIN="\"BEAST\""
+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
 
-# we specify the logging domain here
-DEFS += -DG_LOG_DOMAIN="\"BEAST\""
 
 # special profiling hooks
 PROFILE_SOURCE = # profile.cc
diff --git a/beast-gtk/gxk/Makefile.am b/beast-gtk/gxk/Makefile.am
index 9a2721c..f3f5eae 100644
--- a/beast-gtk/gxk/Makefile.am
+++ b/beast-gtk/gxk/Makefile.am
@@ -3,14 +3,10 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS =
 
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/beast-gtk -I$(top_builddir)/beast-gtk 
-I$(srcdir) $(GXK_CFLAGS) # -I.. for <gxk/*.h> includes
-
-DEFS += $(strip \
-       -DGTK_DISABLE_COMPAT_H  \
-       -DGXK_COMPILATION       \
-       -DG_LOG_DOMAIN=\"GXK\"  \
-)
-# -DGTK_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS -DGTK_ENABLE_BROKEN
+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        += -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)
 
 noinst_LIBRARIES = libgxk.a
 
diff --git a/birnet/Makefile.am b/birnet/Makefile.am
index 0fe0afa..e066d9c 100644
--- a/birnet/Makefile.am
+++ b/birnet/Makefile.am
@@ -2,8 +2,9 @@
 include $(top_srcdir)/Makefile.decl
 
 SUBDIRS                = . tests
-INCLUDES       += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BIRNET_CFLAGS)
+INCLUDES       += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
 DEFS            = -DBIRNET_LOG_DOMAIN=\"BIRNET\" -D_BIRNET_SOURCE_EXTENSIONS
+AM_CXXFLAGS    = $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE $(BIRNET_CFLAGS)
 GLIB_MKENUMS    = glib-mkenums
 
 birnet_headers = $(strip               \
@@ -45,7 +46,7 @@ libbirnetincludedir        = $(includedir)/birnet
 libbirnetinclude_HEADERS   = $(birnet_headers) $(birnet_generated_headers)
 libbirnet_la_SOURCES       = $(birnet_sources)
 libbirnet_la_DEPENDENCIES  =
-libbirnet_la_LIBADD        = $(BIRNET_LIBS) -lm
+libbirnet_la_LIBADD        = $(RAPICORN_LIBS) $(BIRNET_LIBS) -lm
 libbirnet_la_LDFLAGS       = -no-undefined # -Wl,-Bsymbolic
 # keep this .o rule in sync with the corresponding .la rule from Makefile.in
 libbirnet.o: $(libbirnet_la_OBJECTS) $(libbirnet_la_DEPENDENCIES)
diff --git a/birnet/birnetcdefs.h b/birnet/birnetcdefs.h
index 110ffdc..7642283 100644
--- a/birnet/birnetcdefs.h
+++ b/birnet/birnetcdefs.h
@@ -70,9 +70,9 @@ BIRNET_EXTERN_C_BEGIN();
 #define BIRNET_ABORT_NORETURN()                birnet_abort_noreturn()
 /* --- convenient aliases --- */
 #ifdef  _BIRNET_SOURCE_EXTENSIONS
-#define        ISLIKELY                BIRNET_ISLIKELY
-#define        UNLIKELY                BIRNET_UNLIKELY
-#define        LIKELY                  BIRNET_LIKELY
+//#define      ISLIKELY                BIRNET_ISLIKELY
+//#define      UNLIKELY                BIRNET_UNLIKELY
+//#define      LIKELY                  BIRNET_LIKELY
 #define        RETURN_IF_FAIL          BIRNET_RETURN_IF_FAIL
 #define        RETURN_VAL_IF_FAIL      BIRNET_RETURN_VAL_IF_FAIL
 #define        ASSERT_NOT_REACHED      BIRNET_ASSERT_NOT_REACHED
diff --git a/birnet/birnetutils.hh b/birnet/birnetutils.hh
index cc18075..6e82a4f 100644
--- a/birnet/birnetutils.hh
+++ b/birnet/birnetutils.hh
@@ -2,6 +2,7 @@
 #ifndef __BIRNET_UTILS_XX_HH__
 #define __BIRNET_UTILS_XX_HH__
 #include <birnet/birnetcdefs.h>
+#include <rapicorn.hh>
 #include <glib.h> /* g_free */
 #include <string>
 #include <vector>
@@ -84,11 +85,11 @@ public:
 /* --- assertions/warnings/errors --- */
 void    raise_sigtrap           ();
 #if (defined __i386__ || defined __x86_64__) && defined __GNUC__ && __GNUC__ >= 2
-extern inline void BREAKPOINT() { __asm__ __volatile__ ("int $03"); }
+//extern inline void BREAKPOINT() { __asm__ __volatile__ ("int $03"); }
 #elif defined __alpha__ && !defined __osf__ && defined __GNUC__ && __GNUC__ >= 2
-extern inline void BREAKPOINT() { __asm__ __volatile__ ("bpt"); }
+//extern inline void BREAKPOINT() { __asm__ __volatile__ ("bpt"); }
 #else   /* !__i386__ && !__alpha__ */
-extern inline void BREAKPOINT() { raise_sigtrap(); }
+//extern inline void BREAKPOINT() { raise_sigtrap(); }
 #endif  /* __i386__ */
 /* --- threading implementaiton bit --- */
 extern BirnetThreadTable ThreadTable; /* private, provided by birnetthreadimpl.cc */
diff --git a/birnet/tests/Makefile.am b/birnet/tests/Makefile.am
index 89ac42f..72a6e09 100644
--- a/birnet/tests/Makefile.am
+++ b/birnet/tests/Makefile.am
@@ -2,8 +2,9 @@
 # Copyright (C) 2006 Tim Janik
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES       += -I$(top_srcdir) -I$(top_builddir) -I. $(BIRNET_CFLAGS)
-DEFS          += -DBIRNET_LOG_DOMAIN='"$(basename $(@F))"' -DPARANOID -DG_DISABLE_CONST_RETURNS
+INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I.
+DEFS       += -DBIRNET_LOG_DOMAIN='"$(basename $(@F))"' -DPARANOID -DG_DISABLE_CONST_RETURNS
+AM_CXXFLAGS  = $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE $(BIRNET_CFLAGS)
 
 noinst_PROGRAMS  = $(ALLTESTS)
 progs_ldadd     = $(top_builddir)/birnet/libbirnet.o $(BIRNET_LIBS) -lm
diff --git a/bse/Makefile.am b/bse/Makefile.am
index 8a1b06a..d7dafb9 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -7,11 +7,12 @@ SUBDIRS = icons zintern . tests
 # need -I$(top_builddir) for <sfi/sficonfig.h>
 # need -I$(srcdir) for "bseserver.hh" in .genprc.cc
 # need -I. (builddir) for "bsecore.genidl.hh" in bsecore.cc
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED 
-DG_DISABLE_CONST_RETURNS
+INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
 DEFS     += $(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
 
 #
 # setup source file variables
diff --git a/bse/tests/Makefile.am b/bse/tests/Makefile.am
index 89f41cc..b0eda7f 100644
--- a/bse/tests/Makefile.am
+++ b/bse/tests/Makefile.am
@@ -3,9 +3,9 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS =
 
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) $(SFI_CFLAGS)
-
-DEFS += -DG_LOG_DOMAIN=\"BSE-TEST\" # -DG_DISABLE_CONST_RETURNS
+INCLUDES    += -I$(top_srcdir) -I$(top_builddir)
+DEFS        += -DG_LOG_DOMAIN=\"BSE-TEST\" # -DG_DISABLE_CONST_RETURNS
+AM_CXXFLAGS  = $(BSE_CFLAGS) $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 EXTRA_DIST += arrows.gp filter-defs.gp
 
diff --git a/bse/zintern/Makefile.am b/bse/zintern/Makefile.am
index 453a9d8..8333178 100644
--- a/bse/zintern/Makefile.am
+++ b/bse/zintern/Makefile.am
@@ -1,7 +1,8 @@
 # BEAST - Better Audio System
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS
+INCLUDES    += -I$(top_srcdir) -I$(top_builddir)
+AM_CXXFLAGS += $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS
 
 ZFILE_DEFS = $(strip \
        gus-patch               $(srcdir)/gus-patch.bse         \
diff --git a/drivers/Makefile.am b/drivers/Makefile.am
index aaf210a..f1010c5 100644
--- a/drivers/Makefile.am
+++ b/drivers/Makefile.am
@@ -1,8 +1,9 @@
 # BSE-Plugins - Better Sound Engine dynamic Plugins
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES += -I$(top_srcdir) -I. $(BSE_CFLAGS)
-DEFS = $(strip -DG_LOG_DOMAIN=\"BSE-ALSA\")
+INCLUDES    += -I$(top_srcdir) -I.
+DEFS         = $(strip -DG_LOG_DOMAIN=\"BSE-ALSA\")
+AM_CXXFLAGS  = $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 # Plugin bsedevice-alsa
 driversdir          = $(bsedriverdir)
diff --git a/drivers/bse-portaudio/Makefile.am b/drivers/bse-portaudio/Makefile.am
index 5b8dd6c..319d25a 100644
--- a/drivers/bse-portaudio/Makefile.am
+++ b/drivers/bse-portaudio/Makefile.am
@@ -1,8 +1,9 @@
 # BSE-PortAudio - Better Sound Engine PortAudio Driver Package
 
-INCLUDES = -I$(srcdir) -I$(top_builddir) $(BSE_CFLAGS)
-# we specify the logging domain here
-DEFS = $(strip -DG_LOG_DOMAIN=\"BSE-PortAudio\")
+INCLUDES    += -I$(srcdir) -I$(top_builddir)
+DEFS        += $(strip -DG_LOG_DOMAIN=\"BSE-PortAudio\")
+AM_CXXFLAGS  = $(BSE_CFLAGS)
+
 # make automake1.9 happy
 EXTRA_DIST =
 
diff --git a/launchers/Makefile.am b/launchers/Makefile.am
index 367aa6d..9072c0f 100644
--- a/launchers/Makefile.am
+++ b/launchers/Makefile.am
@@ -1,11 +1,9 @@
 # launchers - Beast program starters
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I. $(LAUNCHER_CFLAGS) -DG_DISABLE_CONST_RETURNS
-
-DEFS += $(strip                                        \
-        -DBINDIR=\"$(bindir)\"                                 \
-)
+INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I.
+DEFS        += -DBINDIR=\"$(bindir)\"
+AM_CXXFLAGS  = $(LAUNCHER_CFLAGS) -DG_DISABLE_CONST_RETURNS
 
 #
 # programs to build
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 5ee07db..f24e739 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -3,7 +3,9 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = icons . freeverb # evaluator
 
-INCLUDES += -I$(top_srcdir) -I. $(BSE_CFLAGS) -DG_LOG_DOMAIN="\"$(strip $(basename $(<F)))\""
+INCLUDES    += -I$(top_srcdir) -I.
+DEFS        += -DG_LOG_DOMAIN="\"$(strip $(basename $(<F)))\""
+AM_CXXFLAGS  = $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE -D_BIRNET_SOURCE_EXTENSIONS
 
 # == IDL C++ Plugins ==
 idl_plugins = $(strip                  \
diff --git a/plugins/freeverb/Makefile.am b/plugins/freeverb/Makefile.am
index cf87fd0..938b233 100644
--- a/plugins/freeverb/Makefile.am
+++ b/plugins/freeverb/Makefile.am
@@ -1,7 +1,9 @@
 # Freeverb Makefile
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES += -I$(top_srcdir) -I. $(BSE_CFLAGS) -DG_LOG_DOMAIN="\"$(strip $(basename $(<F)))\""
+INCLUDES    += -I$(top_srcdir) -I.
+DEFS        += -DG_LOG_DOMAIN="\"$(strip $(basename $(<F)))\""
+AM_CXXFLAGS  = $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 # install plugins under:
 plugindir = $(bseplugindir)
diff --git a/sfi/Makefile.am b/sfi/Makefile.am
index 1a6c32a..6865d90 100644
--- a/sfi/Makefile.am
+++ b/sfi/Makefile.am
@@ -2,8 +2,9 @@
 include $(top_srcdir)/Makefile.decl
 
 SUBDIRS   = . tests
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) $(SFI_CFLAGS)
-DEFS     += -DG_LOG_DOMAIN=\"SFI\" -DG_DISABLE_CONST_RETURNS
+INCLUDES    += -I$(top_srcdir) -I$(top_builddir) $(SFI_CFLAGS)
+DEFS        += -DG_LOG_DOMAIN=\"SFI\" -DG_DISABLE_CONST_RETURNS
+AM_CXXFLAGS  = $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 sfi_public_headers = $(strip \
        sfistore.hh     sficomwire.hh   sfifilecrawler.hh \
diff --git a/sfi/tests/Makefile.am b/sfi/tests/Makefile.am
index 0b20166..f574010 100644
--- a/sfi/tests/Makefile.am
+++ b/sfi/tests/Makefile.am
@@ -2,8 +2,9 @@
 # Copyright (C) 2006 Tim Janik
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES       += -I$(top_srcdir) -I$(top_builddir) -I. $(SFI_CFLAGS)
-DEFS          += -DG_LOG_DOMAIN='"$(basename $(@F))"' -DPARANOID # -DG_DISABLE_CONST_RETURNS
+INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I.
+DEFS       += -DG_LOG_DOMAIN='"$(basename $(@F))"' -DPARANOID # -DG_DISABLE_CONST_RETURNS
+AM_CXXFLAGS  = $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 noinst_PROGRAMS   = $(ALLTESTS)
 progs_nosfi_ldadd = $(top_builddir)/birnet/libbirnet.o $(SFI_LIBS) -lm
diff --git a/shell/Makefile.am b/shell/Makefile.am
index dcdefcd..470c48c 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,12 +1,12 @@
 # SHELL - Better Sound Engine Shell
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES += -I$(top_srcdir) -I. -I$(top_builddir) $(BSESCM_CFLAGS) -DG_DISABLE_CONST_RETURNS
-
+INCLUDES += -I$(top_srcdir) -I. -I$(top_builddir)
 DEFS += $(strip                        \
        -DG_LOG_DOMAIN=\"BSESCM\"       \
        $(SUIDMAIN_DEFS)                \
 )
+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 dcab944..56d729e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,8 +3,11 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = . latency scripts bse audio filecheck
 
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(SFI_CFLAGS)
-DEFS += -DG_LOG_DOMAIN="\"BEAST-TEST\"" # -DG_DISABLE_CONST_RETURNS
+INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
+DEFS        += -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
+
 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 1b8502b..171daa2 100644
--- a/tests/bse/Makefile.am
+++ b/tests/bse/Makefile.am
@@ -1,8 +1,10 @@
 # beast/tests/bse
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(SFI_CFLAGS)
-DEFS     += -DG_LOG_DOMAIN="\"BSE-TEST\"" # -DG_DISABLE_CONST_RETURNS
+INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
+DEFS        += -DG_LOG_DOMAIN="\"BSE-TEST\"" # -DG_DISABLE_CONST_RETURNS
+AM_CXXFLAGS  = $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
+
 SFIDL = $(top_builddir)/sfi/sfidl
 SFIDL_INC = --nostdinc -I$(top_srcdir) -I$(top_builddir)
 
diff --git a/tests/filecheck/Makefile.am b/tests/filecheck/Makefile.am
index aa344e5..d906980 100644
--- a/tests/filecheck/Makefile.am
+++ b/tests/filecheck/Makefile.am
@@ -1,8 +1,10 @@
 # beast/tests/filecheck
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(SFI_CFLAGS)
-DEFS += -DG_LOG_DOMAIN="\"BEAST-TEST\"" # -DG_DISABLE_CONST_RETURNS
+INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir)
+DEFS        += -DG_LOG_DOMAIN="\"BEAST-TEST\"" # -DG_DISABLE_CONST_RETURNS
+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 f8bb5e7..f1be112 100644
--- a/tests/latency/Makefile.am
+++ b/tests/latency/Makefile.am
@@ -1,8 +1,10 @@
 # BSE - Better Sound Engine
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(SFI_CFLAGS)
-DEFS     += -DG_LOG_DOMAIN="\"BSE-TEST\"" # -DG_DISABLE_CONST_RETURNS
+INCLUDES    += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
+DEFS        += -DG_LOG_DOMAIN="\"BSE-TEST\"" # -DG_DISABLE_CONST_RETURNS
+AM_CXXFLAGS  = $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
+
 # IDL Compiler
 SFIDL     = $(top_builddir)/sfi/sfidl
 SFIDL_INC = --nostdinc -I$(top_srcdir) -I$(top_builddir)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6b875f2..52522ab 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -3,8 +3,9 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = . scripts
 
-INCLUDES += -I$(top_srcdir) -I$(top_builddir) $(BSE_CFLAGS)
-DEFS += -DG_LOG_DOMAIN=\"BSE-TOOLS\" -DG_DISABLE_CONST_RETURNS
+INCLUDES    += -I$(top_srcdir) -I$(top_builddir)
+DEFS        += -DG_LOG_DOMAIN=\"BSE-TOOLS\" -DG_DISABLE_CONST_RETURNS
+AM_CXXFLAGS  = $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 noinst_PROGRAMS = $(ALLTESTS)
 progs_ldadd     = $(top_builddir)/bse/libbse.la $(BSE_LIBS)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]