From db07a1f968269c3d2076b403ebb808b2fdcc8258 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Sat, 27 Sep 2008 15:52:56 +0000 Subject: 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 ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@144949 f38db490-d61c-443f-a65b-d21fe96a405b --- Makefile.moddir_rules | 6 ------ 1 file changed, 6 deletions(-) (limited to 'Makefile.moddir_rules') 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 -- cgit v1.2.3