From 9695cdd7e72070f3082dff5808bb840a6ce1a430 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <rco@iptel.org>
Date: Fri, 26 Mar 2010 22:15:44 +0000
Subject: [PATCH] - fixes issues related to exclude_modules

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1709 8eb893ce-cfd4-0310-b710-fb5ebe64c474
---
 Makefile.defs          | 7 ++++---
 apps/dsm/mods/Makefile | 6 +++---
 core/Makefile          | 2 +-
 core/plug-in/Makefile  | 3 ---
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Makefile.defs b/Makefile.defs
index 3e5cb840..a508c647 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -33,7 +33,6 @@ CPPFLAGS += -D_DEBUG \
 #LIBSPANDSP_STATIC = yes
 #LIBSPANDSP_LDIR = /usr/local/lib/
 
-
 # compile with sample rate conversion from secret rabbit code? 
 # (see http://www.mega-nerd.com/SRC/)
 #
@@ -63,6 +62,8 @@ spandsp_defs=1
 export spandsp_defs
 CPPFLAGS += -DUSE_SPANDSP -D__STDC_LIMIT_MACROS
 endif
+else
+override exclude_modules += g722
 endif
 
 ifdef USE_LIBSAMPLERATE
@@ -160,7 +161,7 @@ ifeq ($(OS), darwin)
 	      LDFLAGS += -L/opt/local/lib
 	endif	      
 
-	override exclude_modules += binrpcctrl mp3 examples py_sems
+	override exclude_modules += binrpcctrl ivr examples py_sems
 else
 	LDFLAGS+= -fPIC -ldl -lsocket -lnsl -lpthread
 	TARGET=solaris
@@ -272,7 +273,7 @@ export USE_SPANDSP LIBSPANDSP_STATIC LIBSPANDSP_LDIR
 export USE_LIBSAMPLERATE
 export WITH_ZRTP
 export USE_MONITORING
-
+export exclude_modules
 endif  # ifeq ($(makefile_defs, 1)
 
 mk-install-dirs: $(DESTDIR)$(cfg-target) \
diff --git a/apps/dsm/mods/Makefile b/apps/dsm/mods/Makefile
index eff04e8b..e8f21cf7 100644
--- a/apps/dsm/mods/Makefile
+++ b/apps/dsm/mods/Makefile
@@ -5,12 +5,12 @@ COREPATH = $(DSMPATH)/../../core
 include $(COREPATH)/../Makefile.defs
 
 ifneq ($(USE_MONITORING), yes)
-exclude_modules ?= mod_monitoring mod_mysql mod_aws
+override exclude_modules += mod_monitoring mod_mysql mod_aws
 else
-exclude_modules ?= mod_mysql mod_aws
+override exclude_modules += mod_mysql mod_aws
 endif
 
-modules ?= $(filter-out $(subst ;, ,$(exclude_modules))\
+modules = $(filter-out $(subst ;, ,$(exclude_modules))\
 		$(wildcard Makefile*) lib CMakeLists.txt, \
 		$(wildcard *) )
 
diff --git a/core/Makefile b/core/Makefile
index e3734d51..77124ebb 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -24,7 +24,7 @@ clean:
 
 .PHONY: modules
 modules:
-	$(MAKE) -C $(PLUGIN_DIR) $(MAKECMDGOALS)
+	cd $(PLUGIN_DIR); $(MAKE) modules
 
 .PHONY: deps
 deps: $(DEPS)
diff --git a/core/plug-in/Makefile b/core/plug-in/Makefile
index 7856e962..c5e3e410 100644
--- a/core/plug-in/Makefile
+++ b/core/plug-in/Makefile
@@ -1,8 +1,5 @@
 include ../../Makefile.defs
 
-exclude_modules ?= g722
-#echo
-
 modules = $(filter-out $(subst ;, ,$(exclude_modules)) \
 		$(wildcard Makefile*) CMakeLists.txt, \
 		$(wildcard *) )