[svn-commits] branch group/autoconf_and_menuselect r22077 - in
/team/group/autoconf_and_men...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Fri Apr 21 13:41:38 MST 2006
Author: kpfleming
Date: Fri Apr 21 15:41:37 2006
New Revision: 22077
URL: http://svn.digium.com/view/asterisk?rev=22077&view=rev
Log:
more simplifications
Modified:
team/group/autoconf_and_menuselect/Makefile
team/group/autoconf_and_menuselect/agi/Makefile
team/group/autoconf_and_menuselect/apps/Makefile
team/group/autoconf_and_menuselect/cdr/Makefile
team/group/autoconf_and_menuselect/channels/Makefile
team/group/autoconf_and_menuselect/codecs/Makefile
team/group/autoconf_and_menuselect/formats/Makefile
team/group/autoconf_and_menuselect/funcs/Makefile
team/group/autoconf_and_menuselect/include/asterisk/astmm.h
team/group/autoconf_and_menuselect/pbx/Makefile
team/group/autoconf_and_menuselect/res/Makefile
team/group/autoconf_and_menuselect/utils/Makefile
Modified: team/group/autoconf_and_menuselect/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/Makefile?rev=22077&r1=22076&r2=22077&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/Makefile (original)
+++ team/group/autoconf_and_menuselect/Makefile Fri Apr 21 15:41:37 2006
@@ -197,14 +197,16 @@
ASTCFLAGS+=$(MENUSELECT_CFLAGS)
TOPDIR_CFLAGS=-include include/autoconfig.h
-SUBDIR_CFLAGS=-include ../include/autoconfig.h
+MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h
# *CLI> show memory allocations [filename]
# *CLI> show memory summary [filename]
ifneq ($(findstring -DMALLOC_DEBUG,$(ASTCFLAGS)),)
TOPDIR_CFLAGS+=-include include/asterisk/astmm.h
- SUBDIR_CFLAGS+=-include ../include/asterisk/astmm.h
-endif
+ MOD_SUBDIR_CFLAGS+=-include ../include/asterisk/astmm.h
+endif
+
+MOD_SUBDIR_CFLAGS+=-fPIC
ifeq ($(OSARCH),Linux)
ifeq ($(PROC),x86_64)
@@ -510,7 +512,7 @@
rm -f $@.tmp
stdtime/libtime.a:
- CFLAGS="$(ASTCFLAGS) $(SUBDIR_CFLAGS)" $(MAKE) -C stdtime libtime.a
+ CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C stdtime libtime.a
asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
build_tools/make_build_h > include/asterisk/build.h.tmp
@@ -525,7 +527,8 @@
$(CC) $(AUDIO_LIBS) -o muted muted.o
subdirs:
- for x in $(SUBDIRS); do CFLAGS="$(ASTCFLAGS) $(SUBDIR_CFLAGS)" $(MAKE) -C $$x || exit 1 ; done
+ for x in $(MOD_SUBDIRS); do CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C $$x || exit 1 ; done
+ CFLAGS="$(ASTCFLAGS)" $(MAKE) -C utils
clean-depend:
for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done
Modified: team/group/autoconf_and_menuselect/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/agi/Makefile?rev=22077&r1=22076&r2=22077&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/agi/Makefile (original)
+++ team/group/autoconf_and_menuselect/agi/Makefile Fri Apr 21 15:41:37 2006
@@ -3,7 +3,7 @@
#
# Makefile for AGI-related stuff
#
-# Copyright (C) 1999-2005, Digium
+# Copyright (C) 1999-2006, Digium
#
# Mark Spencer <markster at digium.com>
#
@@ -12,8 +12,6 @@
#
AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
-
-CFLAGS+=-DNO_AST_MM
LIBS=
ifeq ($(OSARCH),SunOS)
Modified: team/group/autoconf_and_menuselect/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/apps/Makefile?rev=22077&r1=22076&r2=22077&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/apps/Makefile (original)
+++ team/group/autoconf_and_menuselect/apps/Makefile Fri Apr 21 15:41:37 2006
@@ -16,8 +16,6 @@
ifneq ($(WITH_SMDI),)
CFLAGS+=-DWITH_SMDI
endif
-
-CFLAGS+=-fPIC
# If you have UnixODBC you can use ODBC voicemail
# storage
Modified: team/group/autoconf_and_menuselect/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/cdr/Makefile?rev=22077&r1=22076&r2=22077&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/cdr/Makefile (original)
+++ team/group/autoconf_and_menuselect/cdr/Makefile Fri Apr 21 15:41:37 2006
@@ -12,8 +12,6 @@
#
MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%.so,$(wildcard cdr_*.c)))
-
-CFLAGS+=-fPIC
#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
#This works for even old (2.96) versions of gcc and provides a small boost either way.
Modified: team/group/autoconf_and_menuselect/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/channels/Makefile?rev=22077&r1=22076&r2=22077&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/channels/Makefile (original)
+++ team/group/autoconf_and_menuselect/channels/Makefile Fri Apr 21 15:41:37 2006
@@ -61,8 +61,6 @@
CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
CFLAGS+=-DCRYPTO
-
-CFLAGS+=-fPIC
ZAPDIR=/usr/lib
Modified: team/group/autoconf_and_menuselect/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/codecs/Makefile?rev=22077&r1=22076&r2=22077&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/codecs/Makefile (original)
+++ team/group/autoconf_and_menuselect/codecs/Makefile Fri Apr 21 15:41:37 2006
@@ -12,8 +12,6 @@
#
MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%.so,$(wildcard codec_*.c)))
-
-CFLAGS+=-fPIC
ifeq ($(wildcard g723.1/coder.c),)
MODS:=$(filter-out codec_g723_1.so,$(MODS))
Modified: team/group/autoconf_and_menuselect/formats/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/formats/Makefile?rev=22077&r1=22076&r2=22077&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/formats/Makefile (original)
+++ team/group/autoconf_and_menuselect/formats/Makefile Fri Apr 21 15:41:37 2006
@@ -14,8 +14,6 @@
MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%.so,$(wildcard format_*.c)))
GSMLIB=../codecs/gsm/lib/libgsm.a
-
-CFLAGS+=-fPIC
all: depend $(MODS)
Modified: team/group/autoconf_and_menuselect/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/funcs/Makefile?rev=22077&r1=22076&r2=22077&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/funcs/Makefile (original)
+++ team/group/autoconf_and_menuselect/funcs/Makefile Fri Apr 21 15:41:37 2006
@@ -23,8 +23,6 @@
MODS:=$(filter-out func_curl.so,$(MODS))
endif
endif
-
-CFLAGS+=-fPIC
all: $(MODS)
Modified: team/group/autoconf_and_menuselect/include/asterisk/astmm.h
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/include/asterisk/astmm.h?rev=22077&r1=22076&r2=22077&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/include/asterisk/astmm.h (original)
+++ team/group/autoconf_and_menuselect/include/asterisk/astmm.h Fri Apr 21 15:41:37 2006
@@ -20,7 +20,6 @@
* \brief Asterisk memory usage debugging
*/
-#ifndef NO_AST_MM
#ifndef _ASTERISK_ASTMM_H
#define _ASTERISK_ASTMM_H
@@ -81,4 +80,3 @@
#else
#error "NEVER INCLUDE astmm.h DIRECTLY!!"
#endif /* _ASTERISK_ASTMM_H */
-#endif
Modified: team/group/autoconf_and_menuselect/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/pbx/Makefile?rev=22077&r1=22076&r2=22077&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/pbx/Makefile (original)
+++ team/group/autoconf_and_menuselect/pbx/Makefile Fri Apr 21 15:41:37 2006
@@ -16,8 +16,6 @@
MOC=$(QTDIR)/bin/moc
KDE_FLAGS=-I$(KDEDIR)/include -I$(KDEDIR)/include/kde -I$(QTDIR)/include
KDE_LIBS=-L$(KDEDIR)/lib -L$(QTDIR)/lib -lqt -lkdecore -lkdeui
-
-CFLAGS+=-fPIC
KDE_CONSOLE_OBJS=pbx_kdeconsole_main.o pbx_kdeconsole.o
Modified: team/group/autoconf_and_menuselect/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/res/Makefile?rev=22077&r1=22076&r2=22077&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/res/Makefile (original)
+++ team/group/autoconf_and_menuselect/res/Makefile Fri Apr 21 15:41:37 2006
@@ -38,7 +38,7 @@
#
# Work around buggy RedHat 9.0
#
-CFLAGS+=-DOPENSSL_NO_KRB5 -fPIC
+CFLAGS+=-DOPENSSL_NO_KRB5
all: depend $(MODS)
Modified: team/group/autoconf_and_menuselect/utils/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/utils/Makefile?rev=22077&r1=22076&r2=22077&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/utils/Makefile (original)
+++ team/group/autoconf_and_menuselect/utils/Makefile Fri Apr 21 15:41:37 2006
@@ -3,7 +3,7 @@
#
# Various utilities
#
-# Copyright (C) 1999-2005, Digium
+# Copyright (C) 1999-2006, Digium
#
# Mark Spencer <markster at digium.com>
#
@@ -14,8 +14,6 @@
#
# Don't use ast mm routines
#
-CFLAGS+=-DNO_AST_MM
-
TARGET:=astman smsq stereorize streamplayer
ifeq (${OSARCH},SunOS)
More information about the svn-commits
mailing list