diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 18:54:21 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 18:54:21 +0000 |
| commit | 170dae49be63222c93841e0cc4b12598a8b47388 (patch) | |
| tree | 90d8fe328a1e6371e95020100dad8cd49eb55be0 /Makefile.moddir_rules | |
| parent | 18f0e3efb46368cfa21125c19a9a76cf678d17ca (diff) | |
Merged revisions 43996-43997,44008,44011-44012 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43996 | kpfleming | 2006-09-29 11:47:05 -0500 (Fri, 29 Sep 2006) | 2 lines
another cross-compile fix
........
r43997 | kpfleming | 2006-09-29 11:52:27 -0500 (Fri, 29 Sep 2006) | 2 lines
support --without-curl in configure script
........
r44008 | kpfleming | 2006-09-29 13:25:49 -0500 (Fri, 29 Sep 2006) | 2 lines
don't abuse CFLAGS and LDFLAGS for build of Asterisk components, because they are also then used for non-Asterisk components (like menuselect); use our own variables instead
........
r44011 | kpfleming | 2006-09-29 13:40:17 -0500 (Fri, 29 Sep 2006) | 2 lines
missed one conversion to ASTCFLAGS
........
r44012 | kpfleming | 2006-09-29 13:49:07 -0500 (Fri, 29 Sep 2006) | 2 lines
yet another place where we were not using the correct CFLAGS by default
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44013 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile.moddir_rules')
| -rw-r--r-- | Makefile.moddir_rules | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index 5f60470c8..2144e50a2 100644 --- a/Makefile.moddir_rules +++ b/Makefile.moddir_rules @@ -12,11 +12,11 @@ # ifneq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),) - CFLAGS+=-include $(ASTTOPDIR)/include/asterisk/astmm.h + ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/astmm.h endif ifeq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),) - CFLAGS+=${GC_CFLAGS} + ASTCFLAGS+=${GC_CFLAGS} endif ifneq ($(findstring STATIC_BUILD,$(MENUSELECT_CFLAGS)),) @@ -29,14 +29,14 @@ comma:=, define module_o_template $(2): $(3) -$(2): CFLAGS+=-DAST_MODULE=\"$(1)\" $$(MENUSELECT_OPTS_$(1):%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_INCLUDE)) +$(2): ASTCFLAGS+=-DAST_MODULE=\"$(1)\" $$(MENUSELECT_OPTS_$(1):%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_INCLUDE)) endef define module_so_template $(1)=$(1).so -$(1).so: CFLAGS+=-fPIC +$(1).so: ASTCFLAGS+=-fPIC $(1).so: LIBS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LIB)) -$(1).so: LDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LDFLAGS)) +$(1).so: ASTLDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LDFLAGS)) $(1).so: $(2) endef @@ -102,4 +102,4 @@ endif depend: .depend .depend: - ../build_tools/mkdep $(CFLAGS) `ls *.c *.cc 2> /dev/null` + ../build_tools/mkdep $(ASTCFLAGS) `ls *.c *.cc 2> /dev/null` |