diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-07-15 19:59:35 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-07-15 19:59:35 +0000 |
| commit | 000ba592b2475507c0c5a655f3eac2daf93d2fe0 (patch) | |
| tree | a1180a16189aab888f84a1b9b87536d5bcf2dfa1 /apps | |
| parent | 396ef6f9e7447e443c7dcd491a7ae47eff0e9877 (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: https://origsvn.digium.com/svn/asterisk/trunk@37661 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -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 |