diff options
| -rw-r--r-- | Makefile.moddir_rules | 35 | ||||
| -rw-r--r-- | apps/Makefile | 12 | ||||
| -rw-r--r-- | cdr/Makefile | 10 | ||||
| -rw-r--r-- | channels/Makefile | 16 | ||||
| -rw-r--r-- | codecs/Makefile | 10 | ||||
| -rw-r--r-- | formats/Makefile | 10 | ||||
| -rw-r--r-- | funcs/Makefile | 10 | ||||
| -rw-r--r-- | pbx/Makefile | 10 | ||||
| -rw-r--r-- | res/Makefile | 10 |
9 files changed, 48 insertions, 75 deletions
diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index 8db597cb4..20fcde38a 100644 --- a/Makefile.moddir_rules +++ b/Makefile.moddir_rules @@ -34,6 +34,41 @@ endif include $(ASTTOPDIR)/Makefile.rules +# If MODULE_PREFIX is defined, use it to run the standard functions to set +# C_MODS, CC_MODS, LOADABLE_MODS and EMBEDDED_MODS. +# Each word of MODULE_PREFIX is a prefix for filenames that we consider +# valid C or CC modules (eg. app_, func_ ...). +# Use MODULE_EXCLUDE to specify additional modules to exclude. + +ifneq ($(MODULE_PREFIX),) + # Compute the lowercase and uppercase directory name. The former + # is used as a key in MENUSELECT_EMBED, the latter is part of + # the name of the MENUSELECT_* variable containing the exclude list + # generated by menuselect. + A:=$(notdir $(CURDIR)) + B:=$(shell echo $A | tr "[a-z]" "[A-Z]") + # MENUSELECT_$(L) contains the list of modules excluded by menuselect. + # MODULE_EXCLUDE contains the locally generated exclude list + L:=$(MENUSELECT_$(B)) $(MODULE_EXCLUDE) + # construct the list of C and CC modules from the content of the directory + C_MODS:= + CC_MODS:= + C_MODS+=$(foreach pre,$(MODULE_PREFIX),$(filter-out $(L),$(patsubst %.c,%,$(wildcard $(pre)*.c)))) + CC_MODS+=$(foreach pre,$(MODULE_PREFIX),$(filter-out $(L),$(patsubst %.cc,%,$(wildcard $(pre)*.cc)))) + + # and store in the list of embedded or loadable modules + ifneq ($(findstring $(A),$(MENUSELECT_EMBED)),) + EMBEDDED_MODS:=$(C_MODS) $(CC_MODS) + else + LOADABLE_MODS:=$(C_MODS) $(CC_MODS) + endif +endif +# debugging +# x:=$(shell echo 'in $(B)' >&2) +# x:=$(shell echo 'filtered out $(L)' >&2) +# x:=$(shell echo 'C_MODS= $(C_MODS)' >&2) +# x:=$(shell sleep 2) + # Both C++ and C++ sources need their module name in AST_MODULE # We also pass whatever _INCLUDE list is generated by menuselect # (they are stored in file 'makeopts') diff --git a/apps/Makefile b/apps/Makefile index a04d31fad..21bc0a90a 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -11,16 +11,10 @@ -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps -C_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c))) -CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.cc,%,$(wildcard app_*.cc))) - -LOADABLE_MODS:=$(C_MODS) $(CC_MODS) - -ifneq ($(findstring apps,$(MENUSELECT_EMBED)),) - EMBEDDED_MODS:=$(LOADABLE_MODS) - LOADABLE_MODS:= -endif +#interesting files in this directory start with app_ +MODULE_PREFIX=app_ +# create extra MENUSELECT_DEPENDS entries. MENUSELECT_OPTS_app_directory:=$(MENUSELECT_OPTS_app_voicemail) ifneq ($(findstring ODBC_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),) MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE) diff --git a/cdr/Makefile b/cdr/Makefile index a1dd565b8..45e8b23d9 100644 --- a/cdr/Makefile +++ b/cdr/Makefile @@ -11,15 +11,7 @@ -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps -C_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%,$(wildcard cdr_*.c))) -CC_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.cc,%,$(wildcard cdr_*.cc))) - -LOADABLE_MODS:=$(C_MODS) $(CC_MODS) - -ifneq ($(findstring cdr,$(MENUSELECT_EMBED)),) - EMBEDDED_MODS:=$(LOADABLE_MODS) - LOADABLE_MODS:= -endif +MODULE_PREFIX=cdr_ all: _all diff --git a/channels/Makefile b/channels/Makefile index 06f45f8dc..1bf461e0f 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -11,8 +11,7 @@ -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps -C_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%,$(wildcard chan_*.c))) -CC_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.cc,%,$(wildcard chan_*.cc))) +MODULE_PREFIX=chan_ ifeq ($(OSARCH),OpenBSD) PTLIB=-lpt_OpenBSD_x86_r @@ -36,13 +35,13 @@ ifeq ($(OSARCH),NetBSD) H323LIB=-lh323_NetBSD_x86_r endif +MODULE_EXCLUDE:= ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) - C_MODS:=$(filter-out chan_oss,$(C_MODS)) - C_MODS:=$(filter-out chan_unistim,$(C_MODS)) + MODULE_EXCLUDE+= chan_oss chan_unistim endif ifeq ($(wildcard h323/libchanh323.a),) - CC_MODS:=$(filter-out chan_h323,$(CC_MODS)) + MODULE_EXCLUDE += chan_h323 endif ifndef OPENH323DIR @@ -53,13 +52,6 @@ ifndef PWLIBDIR PWLIBDIR=$(HOME)/pwlib endif -LOADABLE_MODS:=$(C_MODS) $(CC_MODS) - -ifneq ($(findstring channels,$(MENUSELECT_EMBED)),) - EMBEDDED_MODS:=$(LOADABLE_MODS) - LOADABLE_MODS:= -endif - all: _all include $(ASTTOPDIR)/Makefile.moddir_rules diff --git a/codecs/Makefile b/codecs/Makefile index d4402d3c3..99a3b4edd 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -13,15 +13,7 @@ -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps -C_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%,$(wildcard codec_*.c))) -CC_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.cc,%,$(wildcard codec_*.cc))) - -LOADABLE_MODS:=$(C_MODS) $(CC_MODS) - -ifneq ($(findstring codecs,$(MENUSELECT_EMBED)),) - EMBEDDED_MODS:=$(LOADABLE_MODS) - LOADABLE_MODS:= -endif +MODULE_PREFIX=codec_ LIBILBC:=ilbc/libilbc.a LIBLPC10:=lpc10/liblpc10.a diff --git a/formats/Makefile b/formats/Makefile index b003a2d51..ef76ec250 100644 --- a/formats/Makefile +++ b/formats/Makefile @@ -11,15 +11,7 @@ -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps -C_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%,$(wildcard format_*.c))) -CC_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.cc,%,$(wildcard format_*.cc))) - -LOADABLE_MODS:=$(C_MODS) $(CC_MODS) - -ifneq ($(findstring formats,$(MENUSELECT_EMBED)),) - EMBEDDED_MODS:=$(LOADABLE_MODS) - LOADABLE_MODS:= -endif +MODULE_PREFIX=format_ all: _all diff --git a/funcs/Makefile b/funcs/Makefile index 160200035..7d33d4867 100644 --- a/funcs/Makefile +++ b/funcs/Makefile @@ -11,15 +11,7 @@ -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps -C_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.c,%,$(wildcard func_*.c))) -CC_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.cc,%,$(wildcard func_*.cc))) - -LOADABLE_MODS:=$(C_MODS) $(CC_MODS) - -ifneq ($(findstring funcs,$(MENUSELECT_EMBED)),) - EMBEDDED_MODS:=$(LOADABLE_MODS) - LOADABLE_MODS:= -endif +MODULE_PREFIX=func_ all: _all diff --git a/pbx/Makefile b/pbx/Makefile index c443b56fc..bc3d164ac 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -11,15 +11,7 @@ -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps -C_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c))) -CC_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.cc,%,$(wildcard pbx_*.cc))) - -LOADABLE_MODS:=$(C_MODS) $(CC_MODS) - -ifneq ($(findstring pbx,$(MENUSELECT_EMBED)),) - EMBEDDED_MODS:=$(LOADABLE_MODS) - LOADABLE_MODS:= -endif +MODULE_PREFIX=pbx_ all: _all diff --git a/res/Makefile b/res/Makefile index fe9f83106..7dc1b97ac 100644 --- a/res/Makefile +++ b/res/Makefile @@ -11,15 +11,7 @@ -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps -C_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%,$(wildcard res_*.c))) -CC_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.cc,%,$(wildcard res_*.cc))) - -LOADABLE_MODS:=$(C_MODS) $(CC_MODS) - -ifneq ($(findstring res,$(MENUSELECT_EMBED)),) - EMBEDDED_MODS:=$(LOADABLE_MODS) - LOADABLE_MODS:= -endif +MODULE_PREFIX=res_ all: _all |