diff options
author | Luigi Rizzo <rizzo@icir.org> | 2007-12-09 21:29:37 +0000 |
---|---|---|
committer | Luigi Rizzo <rizzo@icir.org> | 2007-12-09 21:29:37 +0000 |
commit | d652be0930e2d62bfff13a551daf362b487a8ce9 (patch) | |
tree | e7a65b58f0224b2a29e98e5838207b56232dc717 /apps/Makefile | |
parent | 08d50c85ec0b946ab73cf6629b4a79915a85eba3 (diff) |
normalize subdirs' Makefile by using ASTTOPDIR and not .. to reference
the top level directory.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92022 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/Makefile')
-rw-r--r-- | apps/Makefile | 14 |
1 files changed, 7 insertions, 7 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 |