mirror of https://github.com/sipwise/sems.git
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
69 lines
2.2 KiB
69 lines
2.2 KiB
Description: Fix module exclusion logic
|
|
Several of the modules cannot be compiled because they miss Makefiles,
|
|
others require additional dependencies or similar. So encode this in the
|
|
build system so that people building do not have to figure this out, even
|
|
if they pass an explicit list of modules to include or exclude.
|
|
Author: Guillem Jover <gjover@sipwise.com>
|
|
|
|
---
|
|
|
|
--- ngcp-sems-1.6.0.orig/apps/Makefile
|
|
+++ ngcp-sems-1.6.0/apps/Makefile
|
|
@@ -1,7 +1,7 @@
|
|
COREPATH ?= ../core
|
|
.DEFAULT_GOAL := all
|
|
|
|
-local_exclude_app_modules=$(exclude_app_modules)
|
|
+local_exclude_app_modules=confpin early_dbprompt mobile_push py_sems gateway twit
|
|
|
|
include $(COREPATH)/../Makefile.defs
|
|
|
|
@@ -12,28 +12,22 @@ include $(COREPATH)/../Makefile.defs
|
|
# make $(app_modules)
|
|
# else
|
|
# if exclude_app_modules is set
|
|
-# make * - $(exclude_app_modules)
|
|
+# make * - $(exclude_app_modules) + local excludes
|
|
# 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 gateway jsonrpc twit db_reg_agent
|
|
-
|
|
- ifneq ($(USE_MONITORING), yes)
|
|
- exclude_app_modules += monitoring
|
|
- endif
|
|
+ifeq ($(app_modules),)
|
|
+ exclude_modules = $(exclude_app_modules)
|
|
+ exclude_modules += $(local_exclude_app_modules)
|
|
|
|
+ ifneq ($(USE_MONITORING), yes)
|
|
+ exclude_modules += monitoring
|
|
endif
|
|
|
|
$(info local_exclude_app_modules: $(local_exclude_app_modules))
|
|
$(info exclude_app_modules: $(exclude_app_modules))
|
|
- app_modules = $(filter-out $(subst ;, ,$(exclude_app_modules))\
|
|
+ app_modules = $(filter-out $(subst ;, ,$(exclude_modules)) \
|
|
$(wildcard Makefile*) CVS CMakeLists.txt, \
|
|
$(wildcard *) examples/tutorial/cc_acc )
|
|
|
|
--- ngcp-sems-1.6.0.orig/apps/examples/Makefile
|
|
+++ ngcp-sems-1.6.0/apps/examples/Makefile
|
|
@@ -3,7 +3,7 @@ COREPATH ?= ../../core
|
|
|
|
include $(COREPATH)/../Makefile.defs
|
|
|
|
-exclude_modules ?=
|
|
+exclude_modules = ivr_examples
|
|
modules = $(filter-out $(subst ;, ,$(exclude_modules)) \
|
|
$(wildcard Makefile*) $(wildcard Readme*) CVS, \
|
|
$(wildcard *) )
|
|
|