mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-20 08:40:16 +00:00
various minor fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37277 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
2
Makefile
2
Makefile
@@ -898,7 +898,7 @@ mxml/libmxml.a:
|
|||||||
@cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
|
@cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
|
||||||
$(MAKE) -C mxml libmxml.a
|
$(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 ..."
|
@echo "Generating list of available modules ..."
|
||||||
@build_tools/prep_moduledeps 2>/dev/null > $@
|
@build_tools/prep_moduledeps 2>/dev/null > $@
|
||||||
|
|
||||||
|
|||||||
@@ -54,6 +54,7 @@
|
|||||||
</member>
|
</member>
|
||||||
<member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP4">
|
<member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP4">
|
||||||
<depend>imap_tk</depend>
|
<depend>imap_tk</depend>
|
||||||
|
<use>ssl</use>
|
||||||
<defaultenabled>no</defaultenabled>
|
<defaultenabled>no</defaultenabled>
|
||||||
</member>
|
</member>
|
||||||
</category>
|
</category>
|
||||||
|
|||||||
@@ -14,10 +14,12 @@ ifneq ($(wildcard ../menuselect.makeopts),)
|
|||||||
include ../menuselect.makedeps
|
include ../menuselect.makedeps
|
||||||
endif
|
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))
|
MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
|
||||||
|
|
||||||
|
CC_MODS:=pbx_kdeconsole
|
||||||
|
|
||||||
all: _all
|
all: _all
|
||||||
|
|
||||||
include $(ASTTOPDIR)/Makefile.moddir_rules
|
include $(ASTTOPDIR)/Makefile.moddir_rules
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
|
|
||||||
/*** MODULEINFO
|
/*** MODULEINFO
|
||||||
<depend>qt</depend>
|
<depend>qt</depend>
|
||||||
|
<defaultenabled>no</defaultenabled>
|
||||||
***/
|
***/
|
||||||
|
|
||||||
#include "pbx_kdeconsole.moc"
|
#include "pbx_kdeconsole.moc"
|
||||||
|
|||||||
Reference in New Issue
Block a user