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 /res | |
| 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 'res')
| -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 - |