summaryrefslogtreecommitdiff
path: root/res/Makefile
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-08-21 02:11:39 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-08-21 02:11:39 +0000
commit0a27d8bfe5fa36d8cb600b5b520f9b5c7fbf0ed6 (patch)
tree270b9c46c1e644483d6d2a35b509f43218ba3252 /res/Makefile
parentf60ada0be22cd646454278e102d384a5dbaf7d59 (diff)
merge new_loader_completion branch, including (at least):
- restructured build tree and makefiles to eliminate recursion problems - support for embedded modules - support for static builds - simpler cross-compilation support - simpler module/loader interface (no exported symbols) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/Makefile')
-rw-r--r--res/Makefile11
1 files changed, 8 insertions, 3 deletions
diff --git a/res/Makefile b/res/Makefile
index 178130820..d7f347900 100644
--- a/res/Makefile
+++ b/res/Makefile
@@ -9,7 +9,7 @@
# the GNU General Public License
#
-ifneq ($(wildcard ../menuselect.makeopts),)
+ifneq ($(wildcard $(ASTTOPDIR)/menuselect.makeopts),)
include ../menuselect.makeopts
include ../menuselect.makedeps
endif
@@ -17,13 +17,18 @@ endif
C_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%,$(wildcard res_*.c)))
CC_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.cc,%,$(wildcard res_*.cc)))
-SELECTED_MODS:=$(C_MODS) $(CC_MODS)
+LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
+
+ifneq ($(findstring res,$(MENUSELECT_EMBED)),)
+ EMBEDDED_MODS:=$(LOADABLE_MODS)
+ LOADABLE_MODS:=
+endif
all: _all
include $(ASTTOPDIR)/Makefile.moddir_rules
-res_snmp.so: snmp/agent.o
+$(res_snmp): snmp/agent.o
clean::
rm -f snmp/*.o