diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | apps/app_voicemail.c | 1 | ||||
-rw-r--r-- | pbx/Makefile | 4 | ||||
-rw-r--r-- | pbx/pbx_kdeconsole.cc | 1 |
4 files changed, 6 insertions, 2 deletions
@@ -898,7 +898,7 @@ mxml/libmxml.a: @cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure $(MAKE) -C mxml libmxml.a -makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml sounds/sounds.xml +makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml @echo "Generating list of available modules ..." @build_tools/prep_moduledeps 2>/dev/null > $@ diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index ebb26ffd2..657945b23 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -54,6 +54,7 @@ </member> <member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP4"> <depend>imap_tk</depend> + <use>ssl</use> <defaultenabled>no</defaultenabled> </member> </category> diff --git a/pbx/Makefile b/pbx/Makefile index 19fb905c4..747843ff4 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -14,10 +14,12 @@ ifneq ($(wildcard ../menuselect.makeopts),) include ../menuselect.makedeps endif -SELECTED_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c))) +SELECTED_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c)) $(patsubst %.cc,%,$(wildcard pbx_*.cc))) MODS:=$(patsubst %,%.so,$(SELECTED_MODS)) +CC_MODS:=pbx_kdeconsole + all: _all include $(ASTTOPDIR)/Makefile.moddir_rules diff --git a/pbx/pbx_kdeconsole.cc b/pbx/pbx_kdeconsole.cc index 10a3f289f..4a9af64d3 100644 --- a/pbx/pbx_kdeconsole.cc +++ b/pbx/pbx_kdeconsole.cc @@ -13,6 +13,7 @@ /*** MODULEINFO <depend>qt</depend> + <defaultenabled>no</defaultenabled> ***/ #include "pbx_kdeconsole.moc" |