diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-27 16:36:39 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-27 16:36:39 +0000 |
| commit | 3d0c27970e149ee3d6091f0af18ba79ee10d51c3 (patch) | |
| tree | 2f1227fdee497a2c12e434f0f60dcddb0b00bf7f /Makefile.moddir_rules | |
| parent | 312c2ae1ebd7309cc68bb576a7471dac0edffa47 (diff) | |
Merged revisions 144949-144951 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r144949 | kpfleming | 2008-09-27 10:52:56 -0500 (Sat, 27 Sep 2008) | 17 lines
Merged revisions 144924-144925 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r144924 | kpfleming | 2008-09-27 10:00:48 -0500 (Sat, 27 Sep 2008) | 6 lines
improve header inclusion process in a few small ways:
- it is no longer necessary to forcibly include asterisk/autoconfig.h; every module already includes asterisk.h as its first header (even before system headers), which serves the same purpose
- astmm.h is now included by asterisk.h when needed, instead of being forced by the Makefile; this means external modules will build properly against installed headers with MALLOC_DEBUG enabled
- simplify the usage of some of these headers in the AEL-related stuff in the utils directory
........
r144925 | kpfleming | 2008-09-27 10:13:30 -0500 (Sat, 27 Sep 2008) | 2 lines
fix some minor issues with rev 144924
........
................
r144950 | kpfleming | 2008-09-27 11:10:33 -0500 (Sat, 27 Sep 2008) | 2 lines
fix bugs caused by r144949 when MALLOC_DEBUG is defined
................
r144951 | kpfleming | 2008-09-27 11:17:43 -0500 (Sat, 27 Sep 2008) | 1 line
remove incorrect comment
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@144991 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile.moddir_rules')
| -rw-r--r-- | Makefile.moddir_rules | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index 9258e8d63..18670f9a5 100644 --- a/Makefile.moddir_rules +++ b/Makefile.moddir_rules @@ -18,12 +18,6 @@ # Also note that we can only set one variable per rule, so we have to # repeat the left hand side to set multiple variables. -ifneq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),) - ifeq ($(findstring astmm.h,$(ASTCFLAGS)),) - ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/astmm.h - endif -endif - ifeq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),) ASTCFLAGS+=${GC_CFLAGS} endif |