diff options
| -rw-r--r-- | apps/Makefile | 14 | ||||
| -rw-r--r-- | cdr/Makefile | 2 | ||||
| -rw-r--r-- | channels/Makefile | 2 | ||||
| -rw-r--r-- | codecs/Makefile | 2 | ||||
| -rw-r--r-- | formats/Makefile | 2 | ||||
| -rw-r--r-- | funcs/Makefile | 2 | ||||
| -rw-r--r-- | pbx/Makefile | 2 | ||||
| -rw-r--r-- | res/Makefile | 2 | ||||
| -rw-r--r-- | utils/Makefile | 2 |
9 files changed, 15 insertions, 15 deletions
diff --git a/apps/Makefile b/apps/Makefile index 0f2fb7780..a04d31fad 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -9,7 +9,7 @@ # the GNU General Public License # --include ../menuselect.makeopts ../menuselect.makedeps +-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))) @@ -23,17 +23,17 @@ endif MENUSELECT_OPTS_app_directory:=$(MENUSELECT_OPTS_app_voicemail) ifneq ($(findstring ODBC_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),) -MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE) -MENUSELECT_DEPENDS_app_directory+=$(MENUSELECT_DEPENDS_ODBC_STORAGE) + MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE) + MENUSELECT_DEPENDS_app_directory+=$(MENUSELECT_DEPENDS_ODBC_STORAGE) endif ifneq ($(findstring IMAP_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),) -MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_IMAP_STORAGE) -MENUSELECT_DEPENDS_app_directory+=$(MENUSELECT_DEPENDS_IMAP_STORAGE) + MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_IMAP_STORAGE) + MENUSELECT_DEPENDS_app_directory+=$(MENUSELECT_DEPENDS_IMAP_STORAGE) endif ifeq (SunOS,$(shell uname)) -MENUSELECT_DEPENDS_app_chanspy+=RT -RT_LIB=-lrt + MENUSELECT_DEPENDS_app_chanspy+=RT + RT_LIB=-lrt endif all: _all diff --git a/cdr/Makefile b/cdr/Makefile index dc765ccc1..a1dd565b8 100644 --- a/cdr/Makefile +++ b/cdr/Makefile @@ -9,7 +9,7 @@ # the GNU General Public License # --include ../menuselect.makeopts ../menuselect.makedeps +-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))) diff --git a/channels/Makefile b/channels/Makefile index bfe4f9149..06f45f8dc 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -9,7 +9,7 @@ # the GNU General Public License # --include ../menuselect.makeopts ../menuselect.makedeps +-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))) diff --git a/codecs/Makefile b/codecs/Makefile index 776f8747f..d4402d3c3 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -11,7 +11,7 @@ # the GNU General Public License # --include ../menuselect.makeopts ../menuselect.makedeps +-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))) diff --git a/formats/Makefile b/formats/Makefile index 2fb821408..b003a2d51 100644 --- a/formats/Makefile +++ b/formats/Makefile @@ -9,7 +9,7 @@ # the GNU General Public License # --include ../menuselect.makeopts ../menuselect.makedeps +-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))) diff --git a/funcs/Makefile b/funcs/Makefile index 1c4c193cf..160200035 100644 --- a/funcs/Makefile +++ b/funcs/Makefile @@ -9,7 +9,7 @@ # the GNU General Public License # --include ../menuselect.makeopts ../menuselect.makedeps +-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))) diff --git a/pbx/Makefile b/pbx/Makefile index 24c4a8e0d..c443b56fc 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -9,7 +9,7 @@ # the GNU General Public License # --include ../menuselect.makeopts ../menuselect.makedeps +-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))) diff --git a/res/Makefile b/res/Makefile index 1a0f45686..fe9f83106 100644 --- a/res/Makefile +++ b/res/Makefile @@ -9,7 +9,7 @@ # the GNU General Public License # --include ../menuselect.makeopts ../menuselect.makedeps +-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))) diff --git a/utils/Makefile b/utils/Makefile index 3dbd4ce7a..c5ad7d40d 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -11,7 +11,7 @@ # the GNU General Public License # --include ../menuselect.makeopts +-include $(ASTTOPDIR)/menuselect.makeopts .PHONY: clean all uninstall |