Module: sems Branch: master Commit: 2af18e622839a89a124d3535cfebcee9bdd0b304 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=2af18e622839a89a124d3535cfebcee9bdd0b304
Author: Stefan Sayer <[email protected]> Committer: Stefan Sayer <[email protected]> Date: Sat Jun 19 21:21:56 2010 +0200 better modules handling; fixed debian packaging --- apps/Makefile | 41 +++++++++++++++++++++++++++++++++-------- pkg/debian/rules | 13 +++++-------- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/apps/Makefile b/apps/Makefile index 7acbdf7..d8aec40 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -1,21 +1,46 @@ COREPATH ?= ../core .DEFAULT_GOAL := all +local_exclude_app_modules=$(exclude_app_modules) + include $(COREPATH)/../Makefile.defs -exclude_app_modules += mp3 examples py_sems xmlrpc2di gateway jsonrpc -ifneq ($(USE_MONITORING), yes) -exclude_app_modules += monitoring -endif +# modules... + +# if app_modules is set +# make $(app_modules) +# else +# if exclude_app_modules is set +# make * - $(exclude_app_modules) +# else +# make * - Makefile.defs:exclude_app_modules + local excludes +# + +ifneq ($(app_modules),) + app_modules = $(app_modules) +else + ifneq ($(local_exclude_app_modules),) + exclude_app_modules = $(local_exclude_app_modules) + else + exclude_app_modules += mp3 examples py_sems xmlrpc2di gateway jsonrpc + + ifneq ($(USE_MONITORING), yes) + exclude_app_modules += monitoring + endif + + endif -$(info exclude_app_modules: $(exclude_app_modules)) -app_modules = $(filter-out $(subst ;, ,$(exclude_app_modules))\ + $(info local_exclude_app_modules: $(local_exclude_app_modules)) + $(info exclude_app_modules: $(exclude_app_modules)) + app_modules = $(filter-out $(subst ;, ,$(exclude_app_modules))\ $(wildcard Makefile*) CVS CMakeLists.txt, \ $(wildcard *) examples/tutorial/cc_acc ) -$(info app_modules: $(app_modules)) -#modules = wav gsm ilbc bot echo announcement recorder voicemail dtmf_demo ivr +endif + + +$(info app_modules: $(app_modules)) .PHONY: all all: modules diff --git a/pkg/debian/rules b/pkg/debian/rules index e9b637a..43ee2f2 100755 --- a/pkg/debian/rules +++ b/pkg/debian/rules @@ -17,13 +17,9 @@ export DH_VERBOSE=1 # force no striping (always include debug symbols for now) export DEB_BUILD_OPTIONS:="$(DEB_BUILD_OPTIONS) nostrip" - - - - PYTHON_MODULES=ivr py_sems conf_auth mailbox pin_collect -EXCLUDED_MODULES=mp3 examples gateway +EXTRA_APP_MODULES=xmlrpc2di jsonrpc CPPFLAGS += -DHAVE_XMLRPCPP_SSL # for older than lenny add: @@ -49,7 +45,8 @@ build-stamp: configure-stamp dh_testdir # Add here commands to compile the package. - USE_SPANDSP=yes CPPFLAGS="$(CPPFLAGS)" $(MAKE) cfg-target=/etc/sems/ prefix=/usr exclude_modules="$(EXCLUDED_MODULES)" DESTDIR=$(CURDIR)/debian/sems + USE_SPANDSP=yes CPPFLAGS="$(CPPFLAGS)" $(MAKE) \ + cfg-target=/etc/sems/ prefix=/usr exclude_app_modules="$(EXCLUDED_MODULES)" DESTDIR=$(CURDIR)/debian/sems #/usr/bin/docbook-to-man debian/ser.sgml > ser.1 touch build-stamp @@ -70,13 +67,13 @@ install: build dh_installdirs # Add here commands to install the package into debian/sems - $(MAKE) -C core/ exclude_modules="$(EXCLUDED_MODULES)" install \ + $(MAKE) -C core/ install \ DESTDIR=$(CURDIR)/debian/sems \ prefix=/usr \ cfg-target=/etc/sems/ - $(MAKE) -C apps/ install exclude_modules="$(EXCLUDED_MODULES) $(PYTHON_MODULES)" \ + $(MAKE) -C apps/ install exclude_app_modules="$(EXCLUDED_MODULES) $(PYTHON_MODULES)" \ DESTDIR=$(CURDIR)/debian/sems \ prefix=/usr \ cfg-target=/etc/sems/ _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
