Index: asterisk-1.0.6/Makefile
===================================================================
--- asterisk-1.0.6.orig/Makefile        2005-01-20 22:18:35.000000000 -0700
+++ asterisk-1.0.6/Makefile     2005-03-04 14:58:45.930523115 -0700
@@ -127,64 +127,67 @@
 AGI_DIR=$(ASTVARLIBDIR)/agi-bin

 INCLUDE=-Iinclude -I../include
-CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
-CFLAGS+=$(OPTIMIZE)
+my_CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
+my_CFLAGS+=$(OPTIMIZE)

 ifneq ($(PROC),ultrasparc)
-CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+my_CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
 endif 
-CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
-CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi)
+my_CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
+my_CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi)

 ifeq (${OSARCH},FreeBSD)
 OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
-CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+my_CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
 LIBS+=$(shell if test  ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
 INCLUDE+=-I/usr/local/include
-CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
+my_CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
 MPG123TARG=freebsd
 endif # FreeBSD

 ifeq (${OSARCH},NetBSD)
-CFLAGS+=-pthread
+my_CFLAGS+=-pthread
 INCLUDE+=-I/usr/local/include -I/usr/pkg/include
 MPG123TARG=netbsd
 endif

 ifeq (${OSARCH},OpenBSD)
-CFLAGS+=-pthread
+my_CFLAGS+=-pthread
 endif

 #Uncomment this to use the older DSP routines
 #CFLAGS+=-DOLD_DSP_ROUTINES

-CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
-CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
+my_CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
+my_CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
 LIBEDIT=editline/libedit.a

 ASTERISKVERSION=$(shell if [ -f .version ]; then cat .version; else if [ -d CVS ]; then if [ -f CVS/Tag ] ; then echo "CVS-`sed 's/^T//g' CVS/Tag`-`date +"%D-%T"`"; else echo "CVS-HEAD-`date +"%D-%T"`"; fi; fi; fi)
 HTTPDIR=$(shell if [ -d /var/www ]; then echo "/var/www"; else echo "/home/httpd"; fi)
 RPMVERSION=$(shell if [ -f .version ]; then sed 's/[-\/:]/_/g' .version; else echo "unknown" ; fi)
-CFLAGS+=-DASTERISK_VERSION=\"$(ASTERISKVERSION)\"
-CFLAGS+=-DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\"
-CFLAGS+=-DASTETCDIR=\"$(ASTETCDIR)\"
-CFLAGS+=-DASTLIBDIR=\"$(ASTLIBDIR)\"
-CFLAGS+=-DASTVARLIBDIR=\"$(ASTVARLIBDIR)\"
-CFLAGS+=-DASTVARRUNDIR=\"$(ASTVARRUNDIR)\"
-CFLAGS+=-DASTSPOOLDIR=\"$(ASTSPOOLDIR)\"
-CFLAGS+=-DASTLOGDIR=\"$(ASTLOGDIR)\"
-CFLAGS+=-DASTCONFPATH=\"$(ASTCONFPATH)\"
-CFLAGS+=-DASTMODDIR=\"$(MODULES_DIR)\"
-CFLAGS+=-DASTAGIDIR=\"$(AGI_DIR)\"
-
-CFLAGS+= $(DEBUG_THREADS)
-CFLAGS+= $(TRACE_FRAMES)
-CFLAGS+= $(MALLOC_DEBUG)
-CFLAGS+= $(BUSYDETECT)
-CFLAGS+= $(OPTIONS)
-CFLAGS+=# -fomit-frame-pointer
+my_CFLAGS+=-DASTERISK_VERSION=\"$(ASTERISKVERSION)\"
+my_CFLAGS+=-DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\"
+my_CFLAGS+=-DASTETCDIR=\"$(ASTETCDIR)\"
+my_CFLAGS+=-DASTLIBDIR=\"$(ASTLIBDIR)\"
+my_CFLAGS+=-DASTVARLIBDIR=\"$(ASTVARLIBDIR)\"
+my_CFLAGS+=-DASTVARRUNDIR=\"$(ASTVARRUNDIR)\"
+my_CFLAGS+=-DASTSPOOLDIR=\"$(ASTSPOOLDIR)\"
+my_CFLAGS+=-DASTLOGDIR=\"$(ASTLOGDIR)\"
+my_CFLAGS+=-DASTCONFPATH=\"$(ASTCONFPATH)\"
+my_CFLAGS+=-DASTMODDIR=\"$(MODULES_DIR)\"
+my_CFLAGS+=-DASTAGIDIR=\"$(AGI_DIR)\"
+
+my_CFLAGS+= $(DEBUG_THREADS)
+my_CFLAGS+= $(TRACE_FRAMES)
+my_CFLAGS+= $(MALLOC_DEBUG)
+my_CFLAGS+= $(BUSYDETECT)
+my_CFLAGS+= $(OPTIONS)
+my_CFLAGS+= -fomit-frame-pointer
+
+override CFLAGS += $(my_CFLAGS)
+
 SUBDIRS=res channels pbx apps codecs formats agi cdr astman stdtime
 ifeq (${OSARCH},Linux)
 LIBS=-ldl -lpthread
@@ -296,7 +299,7 @@
        fi

 asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
-       $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
+       $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDFLAGS) $(LIBS)

 muted: muted.o
        $(CC) -o muted muted.o