diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-15 19:59:35 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-15 19:59:35 +0000 |
| commit | 51482ed964b007aedfa8303fa4fc5483d62279aa (patch) | |
| tree | a1180a16189aab888f84a1b9b87536d5bcf2dfa1 /apps/Makefile | |
| parent | 661a4f572c9bb0b935848a4a906795c18483bfe2 (diff) | |
more Makefile cleanup and consistency stuff
don't reuse LIBS variable from top-level Makefile (oops)
build Asterisk binary after subdirs (preparing for embedded modules)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37661 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/Makefile')
| -rw-r--r-- | apps/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/Makefile b/apps/Makefile index 58a093514..df5f60a44 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -14,7 +14,10 @@ ifneq ($(wildcard ../menuselect.makeopts),) include ../menuselect.makedeps endif -SELECTED_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c))) +C_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c))) +CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.cc,%,$(wildcard app_*.cc))) + +SELECTED_MODS:=$(C_MODS) $(CC_MODS) ifneq ($(findstring ODBC_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),) MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE) @@ -31,6 +34,5 @@ all: _all include $(ASTTOPDIR)/Makefile.moddir_rules ifeq (SunOS,$(shell uname)) -app_chanspy.so: app_chanspy.o - $(CC) $(SOLINK) -o $@ $< -lrt +app_chanspy.so: LIBS+=-lrt endif |