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 /res/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 'res/Makefile')
| -rw-r--r-- | res/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/res/Makefile b/res/Makefile index 22f266abb..178130820 100644 --- a/res/Makefile +++ b/res/Makefile @@ -14,18 +14,16 @@ ifneq ($(wildcard ../menuselect.makeopts),) include ../menuselect.makedeps endif -SELECTED_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%,$(wildcard res_*.c))) +C_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%,$(wildcard res_*.c))) +CC_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.cc,%,$(wildcard res_*.cc))) -ifeq ($(OSARCH),FreeBSD) - SELECTED_MODS:=$(filter-out $(shell if test ${BSDVERSION} -lt 500000 ; then echo "res_config_odbc"; fi),$(SELECTED_MODS)) -endif +SELECTED_MODS:=$(C_MODS) $(CC_MODS) all: _all include $(ASTTOPDIR)/Makefile.moddir_rules -res_snmp.so: res_snmp.o snmp/agent.o +res_snmp.so: snmp/agent.o clean:: rm -f snmp/*.o - |