fixes bug in the buildsystem when building with spandsp (and, libsamplerate, where it was already partially fixed): -DUSE_SPANDSP is added to global CPPFLAGS, so that flags are equal in core and modules

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1148 8eb893ce-cfd4-0310-b710-fb5ebe64c474

Makefile.defs

@@ -53,6 +53,22 @@ LDFLAGS += -lm
 
 OS     = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
 
+ifdef USE_SPANDSP
+ifneq ($(spandsp_defs), 1)
+spandsp_defs=1
+export spandsp_defs
+CPPFLAGS += -DUSE_SPANDSP -D__STDC_LIMIT_MACROS
+endif
+endif
+
+ifdef USE_LIBSAMPLERATE
+ifneq ($(libsrc_defs), 1)
+libsrc_defs=1
+export libsrc_defs
+CPPFLAGS += -DUSE_LIBSAMPLERATE
+endif
+endif
+
 # Additions for Solaris support.
 ifeq ($(OS),solaris)
 	GETARCH=uname -p

core/Makefile

@@ -55,23 +55,9 @@ LDFLAGS += -lspandsp
 endif
 endif
 
-
-ifdef USE_SPANDSP
-ifneq ($(spandsp_defs), 1)
-spandsp_defs=1
-export spandsp_defs
-CPPFLAGS += -DUSE_SPANDSP -D__STDC_LIMIT_MACROS
-endif
-endif
-
 ifdef USE_LIBSAMPLERATE
-ifneq ($(libsrc_defs), 1)
-libsrc_defs=1
-export libsrc_defs
-CPPFLAGS += -DUSE_LIBSAMPLERATE
 LDFLAGS +=-lsamplerate
 endif
-endif
 
 ifdef WITH_ZRTP
 LDFLAGS +=-lzrtp -lbn

core/plug-in/Makefile.app_module

@@ -10,11 +10,6 @@ CFLAGS   += $(module_cflags)
 CPPFLAGS += $(module_cflags)
 CXXFLAGS += $(module_cflags)
 
-ifdef USE_LIBSAMPLERATE
-CPPFLAGS += -DUSE_LIBSAMPLERATE
-LDFLAGS +=-lsamplerate
-endif
-
 app_module_dir = $(COREPATH)/lib
 
 lib_name = $(plug_in_name).so