040624Makefiles.txt
-------------------


Create Makefile.inc that holds:
- compiler options
- flags for features referred to in multiple Makefiles,
- location of 3rd party packages and
- installation directory.

'include' Makefile.inc in all other Makefiles
so that consistent flags are used to compile
various kinds of objects.

Enable more warnings, and more strict
compilation in general.

channels/Makefile:

use g++ to generate chan_h323.so in order to
easily link in the proper version of
libstdc++.


--- /dev/null	Thu Jun 24 22:15:37 2004
+++ Makefile.inc	Thu Jun 24 16:40:05 2004
@@ -0,0 +1,315 @@
+#
+# Asterisk -- A telephony toolkit for Linux.
+# 
+# Top level include file Makefile.inc
+#
+# Copyright (C) 1999, Mark Spencer
+#
+# Mark Spencer <markster@linux-support.net>
+#
+# This program is free software, distributed under the terms of
+# the GNU General Public License
+#
+# All of the asterisk Makefiles 'include' this file to obtain various
+# definitions.
+#
+
+# Rather than export variables from asterisk/Makefile, they are
+# imported from this file, asterisk/Makefile.inc.
+# .EXPORT_ALL_VARIABLES:
+
+# note: variable who's name contains a '.', such as LINK.c, are not
+# exported to the environment, even with the EXPORT_ALL_VARIABLES
+# target.
+
+USE_MYSQL_FRIENDS=NO
+USE_SIP_MYSQL_FRIENDS=NO
+
+# note: Because CXXFLAGS is evaluated when the target's commands are
+# invoked, CXXFLAGS will contain all of the values apended to CFLAGS
+# below.
+CXXFLAGS=$(CFLAGS)
+
+OSARCH=$(shell uname -s)
+PROC=$(shell uname -m)
+
+ifeq ($(PROC),x86_64)
+# You must have GCC 3.4 to use k8, otherwise use athlon
+ifeq (YES,$(shell if $(CC) -v | grep -q 'gcc version 3.4'; then echo "YES" ; fi))
+PROC=k8
+else
+#PROC=athlon
+TARGET_ARCH+=-m64
+endif
+endif
+
+# IS_BSD_COMPATIBLE enables features common to BSD flavor unices.
+ifeq ($(findstring BSD,${OSARCH}),BSD)
+IS_BSD_COMPATIBLE=YES
+endif
+
+ifeq (${OSARCH},Darwin)
+IS_BSD_COMPATIBLE=YES
+endif
+
+ifeq ($(IS_BSD_COMPATIBLE),YES)
+PROC=$(shell uname -m)
+endif
+
+# Pentium Pro Optimize
+#PROC=i686
+
+# Pentium & VIA processors optimize
+#PROC=i586
+
+#PROC=k6
+#PROC=ppc
+
+#TARGET_ARCH+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
+
+TARGET_ARCH += $(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+
+CFLAGS += $(shell if $(CC) -pthread -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-pthread"; fi)
+
+######### More GSM codec optimization
+######### Uncomment to enable MMXTM optimizations for x86 architecture CPU's
+######### which support MMX instructions.  This should be newer pentiums,
+######### ppro's, etc, as well as the AMD K6 and K7.  
+#K6OPT  = -DK6OPT
+
+#Tell gcc and ld to optimize the asterisk's code
+OPTIMIZE=-O6
+CFLAGS +=  $(OPTIMIZE)
+LDFLAGS+=  $(OPTIMIZE)
+
+#Include debug symbols in the executables (-g) and profiling info (-pg)
+CFLAGS += -g #-pg
+
+# If you are running a radio application, define RADIO_RELAX so that the DTMF
+# will be received more reliably
+CPPFLAGS += -DRADIO_RELAX
+
+# If you don't have a lot of memory (e.g. embedded Asterisk), uncomment the
+# following to reduce the size of certain static buffers
+CPPFLAGS += #-DLOW_MEMORY
+
+# Optional debugging parameters
+CPPFLAGS = #-DDEBUG_THREADS #-DDO_CRASH 
+
+# Uncomment next one to enable ast_frame tracing (for debugging)
+CPPFLAGS = #-DTRACE_FRAMES
+
+# Uncomment next one to enable malloc debugging
+# You can view malloc debugging with:
+#   *CLI> show memory allocations [filename]
+#   *CLI> show memory summary [filename]
+#
+CPPFLAGS = #-include $(TOPDIR)/include/asterisk/astmm.h
+
+# Where to install asterisk after compiling
+# Default -> leave empty
+INSTALL_PREFIX=
+
+# command used to install files.
+INSTALL=install
+
+# Staging directory
+# Files are copied here temporarily during the install process
+# For example, make DESTDIR=/tmp/asterisk woud put things in
+# /tmp/asterisk/etc/asterisk
+DESTDIR=
+
+# Original busydetect routine
+CPPFLAGS = #-DBUSYDETECT
+
+# Improved busydetect routine, comment the previous one if you use this one
+CPPFLAGS += -DBUSYDETECT_MARTIN 
+# Detect the busy signal looking only at tone lengths
+# For example if you have 3 beeps 100ms tone, 100ms silence separated by 500 ms of silence
+CPPFLAGS += #-DBUSYDETECT_TONEONLY
+# Inforce the detection of busy singal (get rid of false hangups)
+# Don't use together with -DBUSYDETECT_TONEONLY
+CPPFLAGS += #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
+
+# Install various components to these directories.
+ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
+ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
+ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
+ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
+ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
+ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
+ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
+ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
+ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
+ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+
+MODULES_DIR=$(ASTLIBDIR)/modules
+AGI_DIR=$(ASTVARLIBDIR)/agi-bin
+
+ifndef OPENH323DIR
+OPENH323DIR=$(HOME)/openh323
+endif
+
+ifndef PWLIBDIR
+PWLIBDIR=$(HOME)/pwlib
+endif
+
+ifeq ($(shell [ -f ${HOME}/openh323/lib/libh323_linux_x86_r_s.a ] && echo "YES"),YES)
+OPENH323DIR=$(HOME)/openh323
+H323LIB=-lh323_linux_x86_r_s
+endif
+
+ifeq ($(shell if [ -f ${HOME}/pwlib/lib/libpt_linux_x86_r_s.a ]; then echo "YES"; fi),YES)
+PWLIBDIR=$(HOME)/pwlib
+PTLIB=-lpt_linux_x86_r_s
+endif
+
+ifeq ($(shell if [ -f /usr/ports/net/openh323/work/openh323/lib/libh323_FreeBSD_x86_r_s.a ]; then echo "YES"; fi),YES)
+OPENH323DIR=/usr/ports/net/openh323/work/openh323
+H323LIB=-lh323_FreeBSD_x86_r_s
+endif
+
+ifeq ($(shell if [ -f /usr/ports/devel/pwlib/work/pwlib/lib/libpt_FreeBSD_x86_r_s.a ]; then echo "YES"; fi),YES)
+PWLIBDIR=/usr/ports/devel/pwlib/work/pwlib
+PTLIB=-lpt_FreeBSD_x86_r_s
+endif
+
+ifeq (${OSARCH},OpenBSD)
+OPENH323DIR=/usr/local
+H323LIB=-lh323_OpenBSD_x86_r
+PWLIBDIR=/usr/local
+PTLIB=-lpt_OpenBSD_x86_r
+endif
+
+ifeq ($(shell if [ -d /usr/lib/mysql ]; then echo "YES"; fi),YES)
+MYSQLLIB=-L/usr/lib/mysql -lmysqlclient
+endif
+
+CPPFLAGS += -I$(TOPDIR)/include
+CPPFLAGS += -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
+CFLAGS += -pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
+CFLAGS += $(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
+
+ifeq ($(IS_BSD_COMPATIBLE),YES)
+CPPFLAGS+=-I/usr/local/include
+LDFLAGS+=-L/usr/local/lib
+endif
+
+ifeq (${OSARCH},FreeBSD)
+OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
+CPPFLAGS += $(if ${OSVERSION}<500016,-D_THREAD_SAFE)
+LDLIBS += $(if ${OSVERSION}<502102,-lc_r)
+CPPFLAGS += $(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
+endif # FreeBSD
+
+#Uncomment this to use the older DSP routines
+#CPPFLAGS += -DOLD_DSP_ROUTINES
+
+CPPFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
+CPPFLAGS+=$(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)
+CPPFLAGS+=-DASTERISK_VERSION=\"$(ASTERISKVERSION)\"
+CPPFLAGS+=-DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\"
+CPPFLAGS+=-DASTETCDIR=\"$(ASTETCDIR)\"
+CPPFLAGS+=-DASTLIBDIR=\"$(ASTLIBDIR)\"
+CPPFLAGS+=-DASTVARLIBDIR=\"$(ASTVARLIBDIR)\"
+CPPFLAGS+=-DASTVARRUNDIR=\"$(ASTVARRUNDIR)\"
+CPPFLAGS+=-DASTSPOOLDIR=\"$(ASTSPOOLDIR)\"
+CPPFLAGS+=-DASTLOGDIR=\"$(ASTLOGDIR)\"
+CPPFLAGS+=-DASTCONFPATH=\"$(ASTCONFPATH)\"
+CPPFLAGS+=-DASTMODDIR=\"$(MODULES_DIR)\"
+CPPFLAGS+=-DASTAGIDIR=\"$(AGI_DIR)\"
+
+CFLAGS+=# -fomit-frame-pointer 
+
+SUBDIRS=res channels pbx apps codecs formats agi cdr astman stdtime
+ifeq (${OSARCH},Linux)
+LDLIBS+=-ldl
+endif
+LDLIBS+=-lncurses -lm
+ifeq (${OSARCH},Linux)
+LDLIBS+=-lresolv  #-lnjamd
+endif
+ifeq (${OSARCH},Darwin)
+LDLIBS+=-lresolv
+endif
+OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
+	translate.o file.o say.o pbx.o cli.o md5.o term.o \
+	ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
+	cdr.o tdd.o acl.o rtp.o manager.o asterisk.o ast_expr.o \
+	dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
+	astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
+	utils.o 
+
+ifeq (${OSARCH},Darwin)
+OBJS+=poll.o dlfcn.o
+SO_LDFLAGS+=-Wl,-dynamic
+SO_LDFLAGS+=-dynamic -bundle -undefined suppress -force_flat_namespace
+else
+# retain all global symbols when linking, as required by dynamically
+# loaded modules:
+LDFLAGS+=-Wl,-E
+# flags for compiling shared object code:
+SO_LDFLAGS+=-shared
+# If -g is not specified, remove local symbols when linking shared objects:
+ifneq ($(findstring -g,$(CFLAGS)),-g)
+SO_LDFLAGS+= -Xlinker -x
+endif
+# alwasys use the same option, either -fPIC or -fpic, to compile and
+# link all code withing a given .so module.
+SO_CFLAGS+=-fPIC
+SO_LDFLAGS+=-fPIC
+endif
+
+CC?=gcc
+
+# run these targets even if a file by that name exists:
+.PHONY: all clean install depend
+
+# unless another target is specified, build the 'all' target.
+all:
+
+depend: .depend
+
+.depend:
+	$(TOPDIR)/mkdep $(CFLAGS) $(CPPFLAGS) `ls *.c`
+
+env:
+	env
+
+#----------------
+# Here are default definitions and targets that Gnu Make provides:
+#
+# COMPILE.c =   $(CC) $(CFLAGS)   $(CPPFLAGS) $(TARGET_ARCH) -c
+# COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c
+# LINK.c =      $(CC) $(CFLAGS)   $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH)
+# LINK.cc =    $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH)
+# LINK.o =      $(CC)                         $(LDFLAGS) $(TARGET_ARCH)
+# OUTPUT_OPTION = -o $@
+# 
+# .c.o:
+# 	$(COMPILE.c) $(OUTPUT_OPTION) $<
+# .cc.o:
+# 	$(COMPILE.cc) $(OUTPUT_OPTION) $<
+# .c:
+# 	$(LINK.c) $^ $(LOADLIBES) $(LDLIBS) -o $@
+# .cc:
+# 	$(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@
+# .o:
+# 	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
+#----------------
+
+# for shared object code:
+LINK.cc.so = $(LINK.cc) $(SO_CFLAGS) $(SO_LDFLAGS)
+LINK.so = $(LINK.c) $(SO_CFLAGS) $(SO_LDFLAGS)
+
+%.so : %.c
+	$(LINK.so) $< -o $@
+%.so : %.o
+	$(LINK.so) $< -o $@
+

Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.96
diff -u -r1.96 Makefile
--- Makefile	22 Jun 2004 17:42:13 -0000	1.96
+++ Makefile	25 Jun 2004 02:41:04 -0000
@@ -11,182 +11,9 @@
 # the GNU General Public License
 #
 
-.EXPORT_ALL_VARIABLES:
+TOPDIR=.
+include $(TOPDIR)/Makefile.inc
 
-# Create OPTIONS variable
-OPTIONS=
-
-OSARCH=$(shell uname -s)
-
-ifeq (${OSARCH},Linux)
-PROC=$(shell uname -m)
-ifeq ($(PROC),x86_64)
-# You must have GCC 3.4 to use k8, otherwise use athlon
-PROC=k8
-#PROC=athlon
-OPTIONS+=-m64
-endif
-endif
-
-ifeq ($(findstring BSD,${OSARCH}),BSD)
-PROC=$(shell uname -m)
-endif
-
-# Pentium Pro Optimize
-#PROC=i686
-
-# Pentium & VIA processors optimize
-#PROC=i586
-
-#PROC=k6
-#PROC=ppc
-
-PWD=$(shell pwd)
-
-######### More GSM codec optimization
-######### Uncomment to enable MMXTM optimizations for x86 architecture CPU's
-######### which support MMX instructions.  This should be newer pentiums,
-######### ppro's, etc, as well as the AMD K6 and K7.  
-#K6OPT  = -DK6OPT
-
-#Tell gcc to optimize the asterisk's code
-OPTIMIZE=-O6
-
-#Include debug symbols in the executables (-g) and profiling info (-pg)
-DEBUG=-g #-pg
-
-# If you are running a radio application, define RADIO_RELAX so that the DTMF
-# will be received more reliably
-#OPTIONS += -DRADIO_RELAX
-
-# If you don't have a lot of memory (e.g. embedded Asterisk), uncomment the
-# following to reduce the size of certain static buffers
-#OPTIONS += -DLOW_MEMORY
-
-# Optional debugging parameters
-DEBUG_THREADS = #-DDEBUG_THREADS #-DDO_CRASH 
-
-# Uncomment next one to enable ast_frame tracing (for debugging)
-TRACE_FRAMES = #-DTRACE_FRAMES
-
-# Uncomment next one to enable malloc debugging
-# You can view malloc debugging with:
-#   *CLI> show memory allocations [filename]
-#   *CLI> show memory summary [filename]
-#
-MALLOC_DEBUG = #-include $(PWD)/include/asterisk/astmm.h
-
-# Where to install asterisk after compiling
-# Default -> leave empty
-INSTALL_PREFIX=
-
-# Staging directory
-# Files are copied here temporarily during the install process
-# For example, make DESTDIR=/tmp/asterisk woud put things in
-# /tmp/asterisk/etc/asterisk
-DESTDIR=
-
-# Original busydetect routine
-BUSYDETECT = #-DBUSYDETECT
-
-# Improved busydetect routine, comment the previous one if you use this one
-BUSYDETECT+= -DBUSYDETECT_MARTIN 
-# Detect the busy signal looking only at tone lengths
-# For example if you have 3 beeps 100ms tone, 100ms silence separated by 500 ms of silence
-BUSYDETECT+= #-DBUSYDETECT_TONEONLY
-# Inforce the detection of busy singal (get rid of false hangups)
-# Don't use together with -DBUSYDETECT_TONEONLY
-BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
-
-ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
-ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
-ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
-ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
-ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
-ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
-ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
-ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
-ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
-ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
-
-MODULES_DIR=$(ASTLIBDIR)/modules
-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)
-CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
-CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
-
-ifeq (${OSARCH},FreeBSD)
-OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
-CFLAGS+=$(if ${OSVERSION}<500016,-D_THREAD_SAFE)
-LIBS+=$(if ${OSVERSION}<502102,-lc_r,-pthread)
-INCLUDE+=-I/usr/local/include
-CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
-endif # FreeBSD
-
-ifeq (${OSARCH},OpenBSD)
-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)
-
-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 
-SUBDIRS=res channels pbx apps codecs formats agi cdr astman stdtime
-ifeq (${OSARCH},Linux)
-LIBS=-ldl -lpthread
-endif
-LIBS+=-lncurses -lm
-ifeq (${OSARCH},Linux)
-LIBS+=-lresolv  #-lnjamd
-endif
-ifeq (${OSARCH},Darwin)
-LIBS+=-lresolv
-endif
-OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
-	translate.o file.o say.o pbx.o cli.o md5.o term.o \
-	ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
-	cdr.o tdd.o acl.o rtp.o manager.o asterisk.o ast_expr.o \
-	dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
-	astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
-	utils.o 
-ifeq (${OSARCH},Darwin)
-OBJS+=poll.o dlfcn.o
-ASTLINK=-Wl,-dynamic
-SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
-else
-ASTLINK=-Wl,-E 
-SOLINK=-shared -Xlinker -x
-endif
-
-CC=gcc
 INSTALL=install
 
 _all: all
@@ -201,10 +28,10 @@
 all: depend asterisk subdirs
 
 editline/config.h:
-	cd editline && unset CFLAGS LIBS && ./configure ; \
+	cd editline && unset CC CPPFLAGS CFLAGS LDLIBS LDFLAGS && ./configure ; \
 
 editline/libedit.a: FORCE
-	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
+	cd editline && unset CC CPPFLAGS CFLAGS LDLIBS LDFLAGS && test -f config.h || ./configure
 	$(MAKE) -C editline libedit.a
 
 db1-ast/libdb1.a: FORCE
@@ -251,11 +78,11 @@
 		exit 1; \
 	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)
+asterisk: $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a
+	$(LINK.c) $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDLIBS) -o asterisk
 
 muted: muted.o
-	$(CC) -o muted muted.o
+	$(LINK.c) -o muted muted.o
 
 subdirs: 
 	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
@@ -487,16 +314,7 @@
 
 valgrind: dont-optimize
 
-depend: .depend
-	for x in $(SUBDIRS); do $(MAKE) -C $$x depend || exit 1 ; done
-
-.depend:
-	./mkdep ${CFLAGS} `ls *.c`
-
 FORCE:
 
 %_env:
 	make -C $(shell echo $@ | sed "s/_env//g") env
-
-env:
-	env
Index: agi/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/agi/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- agi/Makefile	22 Jun 2004 17:42:13 -0000	1.8
+++ agi/Makefile	25 Jun 2004 02:41:05 -0000
@@ -11,9 +11,10 @@
 # the GNU General Public License
 #
 
-AGIS=agi-test.agi eagi-test eagi-sphinx-test
+TOPDIR=..
+include $(TOPDIR)/Makefile.inc
 
-CFLAGS+=
+AGIS=agi-test.agi eagi-test eagi-sphinx-test
 
 all: depend $(AGIS)
 
@@ -22,22 +23,14 @@
 	for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
 
 eagi-test: eagi-test.o
-	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
+	$(LINK.c) -o eagi-test eagi-test.o
 
 eagi-sphinx-test: eagi-sphinx-test.o
-	$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o
+	$(LINK.c) -o eagi-sphinx-test eagi-sphinx-test.o
 
 clean:
 	rm -f *.so *.o look .depend eagi-test eagi-sphinx-test
 
-%.so : %.o
-	$(CC) -shared -Xlinker -x -o $@ $<
-
 ifneq ($(wildcard .depend),)
 include .depend
 endif
-
-depend: .depend
-
-.depend:
-	../mkdep $(CFLAGS) `ls *.c`
Index: apps/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/Makefile,v
retrieving revision 1.69
diff -u -r1.69 Makefile
--- apps/Makefile	21 Jun 2004 23:00:00 -0000	1.69
+++ apps/Makefile	25 Jun 2004 02:41:05 -0000
@@ -11,8 +11,8 @@
 # the GNU General Public License
 #
 
-USE_MYSQL_VM_INTERFACE=0
-USE_POSTGRES_VM_INTERFACE=0
+TOPDIR=..
+include $(TOPDIR)/Makefile.inc
 
 #APPS=app_dial.so app_playback.so app_directory.so app_intercom.so app_mp3.so 
 APPS=app_dial.so app_playback.so app_voicemail.so app_directory.so app_mp3.so\
@@ -41,14 +41,12 @@
 APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
 APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
 
-CFLAGS+=-fPIC
-
 ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
-CFLAGS+=-DUSEPOSTGRESVM
+CPPFLAGS+=-DUSEPOSTGRESVM
 endif
 
 ifeq ($(USE_MYSQL_VM_INTERFACE),1)
-CFLAGS+=-DUSEMYSQLVM
+CPPFLAGS+=-DUSEMYSQLVM
 endif
 
 all: $(APPS)
@@ -56,47 +54,36 @@
 clean:
 	rm -f *.so *.o look .depend
 
-%.so : %.o
-	$(CC) $(SOLINK) -o $@ $<
-
-app_rpt.so : app_rpt.o
-	$(CC) $(SOLINK) -o $@ $< -ltonezone
+app_rpt.so : app_rpt.c
+	$(LINK.so) $^ $(LOADLIBES) $(LDLIBS) -ltonezone -o $@
 
 install: all
 	for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 	rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so
 
-app_voicemail.so : app_voicemail.o
+app_voicemail.so : app_voicemail.c
 ifeq ($(USE_MYSQL_VM_INTERFACE),1)
-	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L/usr/lib/mysql -lmysqlclient -lz
+	$(LINK.so) $(MLFLAGS) $< -L/usr/lib/mysql -lmysqlclient -lz -o $@
 else
 ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
-	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq
+	$(LINK.so) $(MLFLAGS) $< -lpq -o $@
 else
-	$(CC) $(SOLINK) -o $@ $(MLFLAGS) $< 
+	$(LINK.so) $(MLFLAGS) $< -o $@
 endif
 endif
 
 app_sql_postgres.o: app_sql_postgres.c
-	$(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
+	$(COMPILE.c) -I/usr/local/pgsql/include $< -o $@
 
-app_sql_postgres.so: app_sql_postgres.o
-	$(CC) $(SOLINK) -o $@ $< -L/usr/local/pgsql/lib -lpq
+app_sql_postgres.so: app_sql_postgres.c
+	$(LINK.so) $^ $(LOADLIBES) $(LDLIBS) -L/usr/local/pgsql/lib -lpq -o $@
 
-app_sql_odbc.so: app_sql_odbc.o
-	$(CC) $(SOLINK) -o $@ $< -lodbc
+app_sql_odbc.so: app_sql_odbc.c
+	$(LINK.so) $^ $(LOADLIBES) $(LDLIBS) -lodbc -o $@
 
 look:	look.c
-	gcc -pipe -O6 -g look.c -o look -lncurses
+	$(LINK.c) $^ -lncurses -o $@
 
 ifneq ($(wildcard .depend),)
 include .depend
 endif
-
-depend: .depend
-
-.depend:
-	../mkdep $(CFLAGS) `ls *.c`
-
-env:
-	env
Index: astman/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/astman/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- astman/Makefile	22 Jun 2004 17:42:13 -0000	1.9
+++ astman/Makefile	25 Jun 2004 02:41:05 -0000
@@ -1,12 +1,11 @@
 #
 # Don't use ast mm routines
 #
-CFLAGS+=-DNO_AST_MM
 
-OSARCH=$(shell uname -s)
-ifeq ($(findstring BSD,${OSARCH}),BSD)
-CFLAGS+=-I/usr/local/include -L/usr/local/lib
-endif
+TOPDIR=..
+include $(TOPDIR)/Makefile.inc
+
+CPPFLAGS+=-DNO_AST_MM
 
 TARGET=$(shell if [ -f /usr/include/newt.h ]; then echo "astman"; else echo "none" ; fi)
 TARGET=$(shell if [ -f /usr/local/include/newt.h ]; then echo "astman"; else echo "none" ; fi)
@@ -25,15 +24,9 @@
 clean:
 	rm -f *.o astman .depend
 
-astman: astman.o ../md5.o
-	$(CC) $(CFLAGS) -o astman astman.o ../md5.o -lnewt
+astman: astman.o $(TOPDIR)/md5.o
+	$(LINK.c) -o astman astman.o $(TOPDIR)/md5.o -lnewt
 
 ifneq ($(wildcard .depend),)
 include .depend
 endif
-
-depend: .depend
-
-.depend:
-	../mkdep $(CFLAGS) `ls *.c`
-
Index: cdr/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/cdr/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- cdr/Makefile	31 May 2004 19:40:22 -0000	1.22
+++ cdr/Makefile	25 Jun 2004 02:41:05 -0000
@@ -11,17 +11,12 @@
 # the GNU General Public License
 #
 
+TOPDIR=..
+include $(TOPDIR)/Makefile.inc
+
 #ADD cdr_pgsql.so to MODS= to include PostgreSQL support: REQUIRES PostgreSQL libs
 MODS=cdr_csv.so
 
-
-CFLAGS+=-fPIC
-
-OSARCH=$(shell uname -s)
-ifeq (${OSARCH},FreeBSD)
-SOLINK+=-L/usr/local/lib
-endif
-
 #
 # unixODBC stuff...
 #
@@ -32,18 +27,18 @@
 # PGSQL stuff...  Autoconf anyone??
 #
 MODS+=$(shell if [ -d /usr/local/pgsql/include ] || [ -d /usr/include/pgsql ] || [ -d /usr/local/include/pgsql ] || [ -d /opt/pgsql/include ] || [ -f /usr/include/libpq-fe.h ] ; then echo "cdr_pgsql.so"; fi)
-CFLAGS+=$(shell if [ -d /usr/local/pgsql/include ]; then echo "-I/usr/local/pgsql/include"; fi)
-CFLAGS+=$(shell if [ -d /usr/include/pgsql ]; then echo "-I/usr/include/pgsql"; fi)
-CFLAGS+=$(shell if [ -d /usr/include/postgresql ]; then echo "-I/usr/include/postgresql"; fi)
-CFLAGS+=$(shell if [ -d /usr/local/include/pgsql ]; then echo "-I/usr/local/include/pgsql"; fi)
-CFLAGS+=$(shell if [ -d /opt/pgsql/include ]; then echo "-I/opt/pgsql/include"; fi)
-#CFLAGS+=$(shell if [ -f /usr/include/libpq-fe.h ]; then echo "-I/usr/include"; fi)
-MLFLAGS=
-MLFLAGS+=$(shell if [ -d /usr/lib/pgsql ]; then echo "-L/usr/lib/pgsql"; fi)
-MLFLAGS+=$(shell if [ -d /usr/local/pgsql/lib ]; then echo "-L/usr/local/pgsql/lib"; fi)
-MLFLAGS+=$(shell if [ -d /usr/local/lib/pgsql ]; then echo "-L/usr/local/lib/pgsql"; fi)
-MLFLAGS+=$(shell if [ -d /opt/pgsql/lib ]; then echo "-L/opt/pgsql/lib"; fi)
-MLFLAGS+=$(shell if [ -f /usr/lib/libpq.so ]; then echo "-L/usr/lib"; fi)
+CPPFLAGS+=$(shell if [ -d /usr/local/pgsql/include ]; then echo "-I/usr/local/pgsql/include"; fi)
+CPPFLAGS+=$(shell if [ -d /usr/include/pgsql ]; then echo "-I/usr/include/pgsql"; fi)
+CPPFLAGS+=$(shell if [ -d /usr/include/postgresql ]; then echo "-I/usr/include/postgresql"; fi)
+CPPFLAGS+=$(shell if [ -d /usr/local/include/pgsql ]; then echo "-I/usr/local/include/pgsql"; fi)
+CPPFLAGS+=$(shell if [ -d /opt/pgsql/include ]; then echo "-I/opt/pgsql/include"; fi)
+#CPPFLAGS+=$(shell if [ -f /usr/include/libpq-fe.h ]; then echo "-I/usr/include"; fi)
+LDFLAGS=
+LDFLAGS+=$(shell if [ -d /usr/lib/pgsql ]; then echo "-L/usr/lib/pgsql"; fi)
+LDFLAGS+=$(shell if [ -d /usr/local/pgsql/lib ]; then echo "-L/usr/local/pgsql/lib"; fi)
+LDFLAGS+=$(shell if [ -d /usr/local/lib/pgsql ]; then echo "-L/usr/local/lib/pgsql"; fi)
+LDFLAGS+=$(shell if [ -d /opt/pgsql/lib ]; then echo "-L/opt/pgsql/lib"; fi)
+LDFLAGS+=$(shell if [ -f /usr/lib/libpq.so ]; then echo "-L/usr/lib"; fi)
 
 all: depend $(MODS)
 
@@ -53,20 +48,12 @@
 clean:
 	rm -f *.so *.o .depend
 
-%.so : %.o
-	$(CC) $(SOLINK) -o $@ $<
+cdr_odbc.so: cdr_odbc.c
+	$(LINK.so) $< -lodbc -o $@
+
+cdr_pgsql.so: cdr_pgsql.c
+	$(LINK.so) $< -lpq -lz -o $@
 
 ifneq ($(wildcard .depend),)
 include .depend
 endif
-
-cdr_odbc.so: cdr_odbc.o
-	$(CC) $(SOLINK) -o $@ $< -lodbc $(MLFLAGS)
-
-cdr_pgsql.so: cdr_pgsql.o
-	$(CC) $(SOLINK) -o $@ $< -lpq -lz $(MLFLAGS)
-
-depend: .depend
-
-.depend:
-	../mkdep $(CFLAGS) `ls *.c`
Index: channels/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- channels/Makefile	4 Jun 2004 15:44:14 -0000	1.54
+++ channels/Makefile	25 Jun 2004 02:41:05 -0000
@@ -11,10 +11,8 @@
 # the GNU General Public License
 #
 
-OSARCH=$(shell uname -s)
-
-USE_MYSQL_FRIENDS=0
-USE_SIP_MYSQL_FRIENDS=0
+TOPDIR=..
+include $(TOPDIR)/Makefile.inc
 
 CHANNEL_LIBS=chan_modem.so chan_sip.so \
 	     chan_modem_aopen.so \
@@ -22,6 +20,12 @@
              chan_agent.so chan_mgcp.so chan_iax2.so \
 	     chan_local.so chan_skinny.so
 
+ifdef H323LIB
+ifdef PTLIB
+CHANNEL_LIBS+=chan_h323.so
+endif
+endif
+
 #
 # If you really want IAX1 uncomment the following, but it is
 # unmaintained
@@ -33,24 +37,10 @@
 #
 #CHANNEL_LIBS+=chan_vofr
 
-ifeq (${OSARCH},OpenBSD)
-MYSQLLIB=-L/usr/local/lib/mysql -lmysqlclient
-CFLAGS+=-I/usr/local/include
-PTLIB=-lpt_OpenBSD_x86_r
-H323LIB=-lh323_OpenBSD_x86_r
-CHANH323LIB=-L/usr/local/lib
-else
-MYSQLLIB=-L/usr/lib/mysql -lmysqlclient
-PTLIB=-lpt_linux_x86_r
-H323LIB=-lh323_linux_x86_r
-CHANH323LIB=-ldl
-endif
-
 ifneq (${OSARCH},Darwin)
 CHANNEL_LIBS+=chan_oss.so
 endif
 ifeq (${OSARCH},FreeBSD)
-SOLINK+=-L/usr/local/lib
 CHANNEL_LIBS+=chan_oss.so
 endif
 
@@ -58,34 +48,35 @@
 CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so)
 CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
 
-CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
-CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
+#CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
+
+CPPFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
 CHANNEL_LIBS+=$(shell [ -f /usr/include/alsa/asoundlib.h ] && echo "chan_alsa.so")
-CFLAGS+=$(shell [ -f /usr/lib/libpri.so.1 ] && echo " -DZAPATA_PRI")
-CFLAGS+=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo " -DZAPATA_R2")
-CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR")
+CPPFLAGS+=$(shell [ -f /usr/lib/libpri.so.1 ] && echo " -DZAPATA_PRI")
+CPPFLAGS+=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo " -DZAPATA_R2")
+CPPFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR")
 ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri")
 ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2")
-CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING")
+CPPFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
+CPPFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING")
 CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" )
-CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX")
+CPPFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX")
 
 ALSA_SRC=chan_alsa.c
 ALSA_SRC+=$(shell [ -f alsa-monitor.h ] && echo "alsa-monitor.h")
 
-CFLAGS+=-DCRYPTO
-CFLAGS+=-fPIC
+CPPFLAGS+=-DCRYPTO
 
-ifeq ($(USE_MYSQL_FRIENDS),1)
-CFLAGS+=-DMYSQL_FRIENDS
-USE_SIP_MYSQL_FRIENDS=1
+# these are defined in $(TOPDIR)/Makefile.inc
+ifeq ($(USE_MYSQL_FRIENDS),YES)
+CPPFLAGS+=-DMYSQL_FRIENDS
+USE_SIP_MYSQL_FRIENDS=YES
 endif
-ifeq ($(USE_SIP_MYSQL_FRIENDS),1)
-CFLAGS+=-DSIP_MYSQL_FRIENDS
+ifeq ($(USE_SIP_MYSQL_FRIENDS),YES)
+CPPFLAGS+=-DSIP_MYSQL_FRIENDS
 endif
 
-CFLAGS+=#-DVOFRDUMPER
+CPPFLAGS+=#-DVOFRDUMPER
 
 ZAPDIR=/usr/lib
 
@@ -94,15 +85,7 @@
 
 CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" )
 
-ifndef OPENH323DIR
-OPENH323DIR=$(HOME)/openh323
-endif
-
-ifndef PWLIBDIR
-PWLIBDIR=$(HOME)/pwlib
-endif
-
-#CFLAGS+=$(shell [ -f $(ZAPDIR)/libzap.a ] && echo "-I$(ZAPDIR)")
+#CPPFLAGS+=$(shell [ -f $(ZAPDIR)/libzap.a ] && echo "-I$(ZAPDIR)")
 
 all: depend $(CHANNEL_LIBS) 
 
@@ -110,18 +93,11 @@
 	rm -f *.so *.o .depend
 	rm -f busy.h ringtone.h gentone gentone-ulaw
 
-%.so : %.o
-	$(CC) $(SOLINK) -o $@ $<
-
-ifneq ($(wildcard .depend),)
-include .depend
-endif
-
 gentone: gentone.c
-	$(CC) -o gentone gentone.c -lm
+	$(LINK.c) -o gentone gentone.c -lm
 
 gentone-ulaw: gentone-ulaw.c
-	$(CC) -o gentone-ulaw gentone-ulaw.c -lm
+	$(LINK.c) -o gentone-ulaw gentone-ulaw.c -lm
 
 busy.h: gentone
 	./gentone busy 480 620
@@ -129,71 +105,70 @@
 ringtone.h: gentone
 	./gentone ringtone 440 480
 
-chan_oss.o: chan_oss.c  busy.h ringtone.h
+#chan_oss.o: chan_oss.c busy.h ringtone.h
 
 ifeq (${OSARCH},OpenBSD)
-chan_oss.so: chan_oss.o
-	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
+OSS_LIB=-lossaudio
 endif
 
-chan_iax2.so: chan_iax2.o iax2-parser.o
-ifeq ($(USE_MYSQL_FRIENDS),1)
-	$(CC) $(SOLINK) -o $@ chan_iax2.o iax2-parser.o $(MYSQLLIB) -lz
+chan_oss.so: chan_oss.c busy.h ringtone.h
+	$(LINK.so) $< $(OSS_LIB) -o $@
+
+chan_iax2.so: chan_iax2.c iax2-parser.c
+ifeq ($(USE_MYSQL_FRIENDS),YES)
+	$(LINK.so) $^ $(MYSQLLIB) -lz -o $@
 else
-	$(CC) $(SOLINK) -o $@ chan_iax2.o iax2-parser.o
+	$(LINK.so) $^ -o $@
 endif
 
-chan_iax.so: chan_iax.o
-ifeq ($(USE_MYSQL_FRIENDS),1)
-	$(CC) $(SOLINK) -o $@ chan_iax.o $(MYSQLLIB) -lz
+chan_iax.so: chan_iax.c
+ifeq ($(USE_MYSQL_FRIENDS),YES)
+	$(LINK.so) $< $(MYSQLLIB) -lz -o $@
 else
-	$(CC) $(SOLINK) -o $@ chan_iax.o
+	$(LINK.so) $< -o $@
 endif
 
 chan_zap.o: chan_zap.c
-	$(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c
+	$(LINK.c) $< -o $@
 
-chan_zap.so: chan_zap.o
-	$(CC) $(SOLINK) -o $@ $<  $(ZAPPRI) $(ZAPR2) -ltonezone
+chan_zap.so: chan_zap.c
+	$(LINK.so) $^ $(ZAPPRI) $(ZAPR2) -ltonezone $(LOADLIBES) $(LDLIBS) -o $@
 
-chan_sip.so: chan_sip.o
-ifeq ($(USE_SIP_MYSQL_FRIENDS),1)
-	$(CC) $(SOLINK) -o $@ chan_sip.o $(MYSQLLIB) -lz
+chan_sip.so: chan_sip.c
+ifeq ($(USE_SIP_MYSQL_FRIENDS),YES)
+	$(LINK.so) $< $(MYSQLLIB) -lz -o $@
 else
-	$(CC) $(SOLINK) -o $@ chan_sip.o
+	$(LINK.so) $< -o $@
 endif
 
 chan_alsa.o: $(ALSA_SRC)
 
 
-chan_alsa.so: chan_alsa.o
-	$(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl
-
-chan_nbs.so: chan_nbs.o
-	$(CC) $(SOLINK) -o $@ $< -lnbs
+chan_alsa.so: chan_alsa.c
+	$(LINK.so) $^ -o $@
 
-chan_vpb.o: chan_vpb.c
-	$(CXX) -c $(CFLAGS) -o $@ chan_vpb.c
+chan_nbs.so: chan_nbs.c
+	$(LINK.so) $^ -lnbs -o $@
 
-chan_vpb.so: chan_vpb.o
-	 $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl
+chan_vpb.so: chan_vpb.c
+	 $(LINK.so) $^ -lvpb -lm -o $@
 
-chan_h323.so: chan_h323.o h323/libchanh323.a
-	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lpthread -lcrypto -lssl -lexpat
+chan_h323.so: chan_h323.c h323/libchanh323.a
+	$(LINK.cc.so) $^ \
+ -L$(OPENH323DIR)/lib $(H323LIB) \
+ -L$(PWLIBDIR)/lib $(PTLIB) \
+ $(DL_LIB) -L/usr/lib -lcrypto -lssl -lexpat -lldap -lstdc++ $(LOADLIBES) $(LDLIBS) -o $@
 
+h323/libchanh323.a h323/ast_h323.o:
+	$(MAKE) -C h323 all
 
 #chan_modem.so : chan_modem.o
-#	$(CC) -rdynamic -shared -Xlinker -x -o $@ $<
+#	$(LINK.so) $< -o $@
 
 install: all
 	for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
 
-depend: .depend
-
-.depend:
-	../mkdep $(CFLAGS) `ls *.c`
-
-env:
-	env
-
+ifneq ($(wildcard .depend),)
+include .depend
+endif
Index: channels/h323/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/h323/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- channels/h323/Makefile	22 Jun 2004 17:42:13 -0000	1.16
+++ channels/h323/Makefile	25 Jun 2004 02:41:12 -0000
@@ -1,5 +1,8 @@
 # include the Makefile of OpenH323 
 
+TOPDIR=../..
+include $(TOPDIR)/Makefile.inc
+
 ifndef OPENH323DIR
 OPENH323DIR=$(HOME)/openh323
 endif
@@ -19,15 +22,7 @@
 #
 # This needs to be updated to deal with more than just little endian machines
 #
-OSARCH=$(shell uname -s)
-ifneq (${OSARCH},FreeBSD)
-CFLAGS += -march=$(shell uname -m)
-endif
-CFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
-
-ifeq (${OSARCH},Linux)
-LDLIBS+=-ldl
-endif
+CPPFLAGS += -DPBYTE_ORDER=PLITTLE_ENDIAN
 
 #############################################
 #
@@ -36,31 +31,32 @@
 #
 # Janus release directives, comment below if your brave enough for Janus
 #OSARCH=$(shell uname -s)
-#CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
-#CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations 
-#CFLAGS += -D_REENTRANT -D_GNU_SOURCE
-#CFLAGS += -I../../include
-#CFLAGS += -I$(PWLIBDIR)/include 
-#CFLAGS += -I$(OPENH323DIR)/include -Wno-missing-prototypes -Wno-missing-declarations
+#CPPFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
+#CFLAGS += -pipe -Wall -fPIC
+#CPPFLAGS += -D_REENTRANT -D_GNU_SOURCE
+#CPPFLAGS += -I$(TOPDIR)/include
+#CPPFLAGS += -I$(PWLIBDIR)/include 
+#CPPFLAGS += -I$(OPENH323DIR)/include
+#CFLAGS += -Wno-missing-prototypes -Wno-missing-declarations
 
 # Pre Janus release directives
-CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
+CPPFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
 CFLAGS += -pipe -Wall -fPIC
 ifeq (${OSARCH},Linux)
-CFLAGS += -DP_LINUX
+CPPFLAGS += -DP_LINUX
 LIBS+=-lpthread
 endif
-ifeq ($(findstring BSD,${OSARCH}),BSD)
-CFLAGS += -pthread
+ifeq ($(IS_BSD_COMPATIBLE),YES)
+LDFLAGS += -pthread
 endif
-CFLAGS += -D_REENTRANT -D_GNU_SOURCE
-CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
-CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
-CFLAGS += -I../../include
-CFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include
-CFLAGS += -I$(OPENH323DIR)/include
+CPPFLAGS += -D_REENTRANT -D_GNU_SOURCE
+CPPFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
+CPPFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
+CPPFLAGS += -I$(TOPDIR)/include
+CPPFLAGS += -I$(PWLIBDIR)/include/ptlib/unix -I$(PWLIBDIR)/include
+CPPFLAGS += -I$(OPENH323DIR)/include
 CFLAGS += -Wno-missing-prototypes -Wno-missing-declarations
-LIBS+= -lcrypto -lssl -lexpat
+LIBS+= -lcrypto -lssl -lexpat -lldap
 
 all:   	libchanh323.a
 
@@ -70,22 +66,31 @@
 	fi ; 
 	install h323.conf.sample $(ASTETCDIR)/h323.conf
  
-
+# note: use $(SO_CFLAGS) to ensure that all objects are compatible
+# with dynamic and shared linking.
 ast_h323.o:	ast_h323.cpp
-	$(CXX) -g -c -fno-rtti -o $@ $(CFLAGS) $<
+	$(COMPILE.cc) $(SO_CFLAGS) -fno-rtti $< -o $@
 
 libchanh323.a:	ast_h323.o
 	ar cr libchanh323.a ast_h323.o
 
 chan_h323.so:	
-	$(CXX)  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib $(CHANH323LIB)
+	$(LINK.cc.so) -o chan_h323.so chan_h323.o ast_h323.o \
+ -L$(OPENH323DIR)/lib -lh323_linux_x86_r \
+ -L$(PWLIBDIR)/lib  -lpt_linux_x86_r \
+ -L/usr/lib $(CHANH323LIB)
 
 chan_h323_d.so:	chan_h323.o ast_h323.o
-	$(CXX)     -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib $(CHANH323LIB)
+	$(LINK.cc.so) -o chan_h323.so chan_h323.o ast_h323.o \
+ -L$(OPENH323DIR)/lib -lh323_linux_x86_d \
+ -L$(PWLIBDIR)/lib  -lpt_linux_x86_d \
+ -L/usr/lib $(CHANH323LIB)
 
 chan_h323_s.so:	chan_h323.o ast_h323.o
-	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib $(CHANH323LIB)
+	$(LINK.cc.so) -o chan_h323.so chan_h323.o ast_h323.o \
+ -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s \
+ -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s \
+ -L/usr/lib $(CHANH323LIB)
+
 clean:
 	rm -f *.o *.so core.* libchanh323.a
-
-
Index: codecs/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- codecs/Makefile	25 Feb 2004 04:10:32 -0000	1.21
+++ codecs/Makefile	25 Jun 2004 02:41:13 -0000
@@ -11,6 +11,9 @@
 # the GNU General Public License
 #
 
+TOPDIR=..
+include $(TOPDIR)/Makefile.inc
+
 #
 # Uncomment if you have g723.1 code (with the same API as the Annex-A code
 # and have placed it in the g723.1 directory and/or the Annex-B code in 
@@ -21,8 +24,7 @@
 MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
 MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
 MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
-CFLAGS+=-fPIC
-CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
+CPPFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
 
 LIBG723=g723.1/libg723.a
 LIBG723B=g723.1b/libg723b.a
@@ -37,6 +39,10 @@
         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
 	codec_g726.so
 
+# note: use $(SO_CFLAGS) to ensure that all objects in this directory
+# are compatible with dynamic and shared linking.
+CFLAGS+= $(SO_CFLAGS)
+
 all: depend $(CODECS)
 
 clean:
@@ -62,36 +68,30 @@
 $(LIBILBC):
 	$(MAKE) -C ilbc all
 
-codec_ilbc.so: codec_ilbc.o $(LIBILBC)
-	$(CC) $(SOLINK) -o $@ $< $(LIBILBC)
+codec_ilbc.so: codec_ilbc.c $(LIBILBC)
+	$(LINK.so) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
-codec_g723_1.so : codec_g723_1.o $(LIBG723)
-	$(CC) $(SOLINK) -o $@ $< $(LIBG723)
+codec_g723_1.so : codec_g723_1.c $(LIBG723)
+	$(LINK.so) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
 codec_g723_1b.o : codec_g723_1.c
-	$(CC) -c -o $@ $(CFLAGS) -DANNEX_B -Dsingle $<
+	$(COMPILE.c) -DANNEX_B -Dsingle $< -o $@
 
-codec_g723_1b.so : codec_g723_1b.o $(LIBG723B)
-	$(CC) $(SOLINK) -o $@ $< $(LIBG723B) -lm
+codec_g723_1b.so : codec_g723_1b.c $(LIBG723B)
+	$(LINK.so) $^ $(LOADLIBES) $(LDLIBS) -lm -o $@
 
-codec_gsm.so: codec_gsm.o $(LIBGSMT) 
-	$(CC) $(SOLINK) -o $@ $< $(LIBGSM)
+codec_gsm.so: codec_gsm.c $(LIBGSMT) 
+	$(LINK.so) $^ $(LOADLIBES) $(LDLIBS) $(LIBGSM) -o $@
 
-codec_speex.so: codec_speex.o
-	$(CC) $(SOLINK) -o $@ $< $(LIBSPEEX)
+codec_speex.so: codec_speex.c
+	$(LINK.so) $^ $(LOADLIBES) $(LDLIBS) $(LIBSPEEX) -o $@
 
-codec_lpc10.so: codec_lpc10.o $(LIBLPC10)
-	$(CC) $(SOLINK) -o $@ $< $(LIBLPC10) -lm
-
-%.so : %.o
-	$(CC) $(SOLINK) -o $@ $<
-
-include .depend
+codec_lpc10.so: codec_lpc10.c $(LIBLPC10)
+	$(LINK.so) $^ $(LOADLIBES) $(LDLIBS) -lm -o $@
 
 install: all
 	for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 
-depend: .depend
-
-.depend:
-	../mkdep $(CFLAGS) `ls *.c`
+ifneq ($(wildcard .depend),)
+include .depend
+endif
Index: codecs/gsm/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/gsm/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- codecs/gsm/Makefile	22 Jun 2004 17:42:13 -0000	1.15
+++ codecs/gsm/Makefile	25 Jun 2004 02:41:14 -0000
@@ -2,6 +2,9 @@
 # Universitaet Berlin.  See the accompanying file "COPYRIGHT" for
 # details.  THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
 
+TOPDIR=../..
+include $(TOPDIR)/Makefile.inc
+
 # Machine- or installation dependent flags you should configure to port
 
 SASR	= -DSASR
@@ -37,14 +40,20 @@
 ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
 ######### probably require gcc. 
 
-ifneq (${OSARCH},Darwin)
-ifneq (${PROC},x86_64)
-ifneq ($(shell uname -m),ppc)
-ifneq ($(shell uname -m),alpha)
-OPTIMIZE+=-march=$(PROC)
+ifeq (${OSARCH},Darwin)
+TARGET_ARCH=
 endif
+
+ifeq (${PROC},x86_64)
+TARGET_ARCH=
 endif
+
+ifeq ($(shell uname -m),ppc)
+TARGET_ARCH=
 endif
+
+ifeq ($(shell uname -m),alpha)
+TARGET_ARCH=
 endif
 
 PG =
@@ -65,13 +74,16 @@
 # CCFLAGS 	= -c -O
 
 CC		?= gcc
-CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC $(OPTIMIZE) -fomit-frame-pointer
+CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fomit-frame-pointer
 
 LD 		= $(CC)
 
 # LD		= gcc
 # LDFLAGS 	=
 
+# note: use $(SO_CFLAGS) to ensure that all objects in this directory
+# are compatible with dynamic and shared linking.
+CFLAGS+= $(SO_CFLAGS)
 
 # If your compiler needs additional flags/libraries, regardless of
 # the source compiled, configure them here.
@@ -340,7 +352,7 @@
 # The basic API: libgsm
 
 $(LIBGSMSO):	$(LIB) $(GSM_OBJECTS)
-		$(LD) -o $@.1.0.10 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(GSM_OBJECTS) -lc
+		$(LD).1.0.10 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(GSM_OBJECTS) -lc -o $@
 		ln -fs libgsm.so.1.0.10 lib/libgsm.so.1
 		ln -fs libgsm.so.1.0.10 lib/libgsm.so
 
Index: codecs/ilbc/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- codecs/ilbc/Makefile	13 Jun 2004 21:25:10 -0000	1.5
+++ codecs/ilbc/Makefile	25 Jun 2004 02:41:14 -0000
@@ -1,5 +1,12 @@
-ARCH=$(PROC)
-CFLAGS+=-Wall -Werror -fPIC -O3 -march=$(ARCH) -funroll-loops -fomit-frame-pointer
+TOPDIR=../..
+include $(TOPDIR)/Makefile.inc
+
+CFLAGS+=-Wall -Werror -O3 -funroll-loops -fomit-frame-pointer
+
+# note: use $(SO_CFLAGS) to ensure that all objects in this directory
+# are compatible with dynamic and shared linking.
+CFLAGS+= $(SO_CFLAGS)
+
 LIB=libilbc.a
 
 OBJS= anaFilter.o iCBSearch.o packing.o \
Index: codecs/lpc10/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- codecs/lpc10/Makefile	22 Jun 2004 17:42:14 -0000	1.11
+++ codecs/lpc10/Makefile	25 Jun 2004 02:41:14 -0000
@@ -2,8 +2,8 @@
 # Makefile for LPC-10 speech coder library (unix)
 # 
 
-# default C compiler
-CC?= gcc
+TOPDIR=../..
+include $(TOPDIR)/Makefile.inc
 
 # 
 # These definitions for CFLAGS and LIB_TARGET_DIR are used when one
@@ -21,21 +21,25 @@
 # directives can find the machine.h file.
 # 
 
-WARNINGS = -Wall -Wno-comment -Wno-error
-CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
-#CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
+CFLAGS += -Wall -Wno-comment -Wno-error
+CPPFLAGS += -I$(LIB_TARGET_DIR)
+CPPFLAGS += -DP_R_O_T_O_T_Y_P_E_S
+
+# note: use $(SO_CFLAGS) to ensure that all objects in this directory
+# are compatible with dynamic and shared linking.
+CFLAGS+= $(SO_CFLAGS)
 
 #fix for PPC processors and ALPHA too
-ifneq ($(OSARCH),Darwin)
-ifneq ($(findstring BSD,${OSARCH}),BSD)
-ifneq ($(PROC),ppc)
-ifneq ($(PROC),x86_64)
-ifneq ($(PROC),alpha)
-	CFLAGS+= -march=$(PROC)
-endif
-endif
+ifeq ($(PROC),ppc)
+TARGET_ARCH=
 endif
+
+ifeq ($(PROC),x86_64)
+TARGET_ARCH=
 endif
+
+ifeq ($(PROC),alpha)
+TARGET_ARCH=
 endif
 
 LIB = $(LIB_TARGET_DIR)/liblpc10.a
Index: db1-ast/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/db1-ast/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- db1-ast/Makefile	19 Aug 2003 16:42:30 -0000	1.2
+++ db1-ast/Makefile	25 Jun 2004 02:41:22 -0000
@@ -1,5 +1,8 @@
 #	@(#)Makefile	8.9 (Berkeley) 7/14/94
 
+TOPDIR=..
+include $(TOPDIR)/Makefile.inc
+
 LIBDB=	libdb1.a
 ARCH=$(shell uname -m)
 ifeq ($(ARCH),alpha)
@@ -20,7 +23,7 @@
 	rec_seq.o rec_utils.o
 MISC=
 OBJS=	$(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) $(OBJ5) $(MISC)
-SHOBJS=	$(patsubst %.o,%.os,$(OBJS))
+SHOBJS=	$(patsubst %.o,%.so,$(OBJS))
 
 all: $(LIBDB) #$(LIBDBSO) $(PROG)
 
@@ -30,37 +33,39 @@
 	ranlib $@
 
 $(LIBDBSO): $(SHOBJS)
-	$(CC) -Wl,-O1 -Wl,--version-script=libdb.map -Wl,-soname=$(LIBDBSO) -shared -o $@ $^
+	$(LINK.so) -Wl,-O1 -Wl,--version-script=libdb.map -Wl,-soname=$(LIBDBSO) -shared $^ -o $@
 	ln -sf $@ libdb.so
 
 $(PROG): db_dump185.o $(LIBDBSO)
-	$(CC) -o $@ db_dump185.o -L. -ldb
+	$(LINK.c) db_dump185.o -L. -ldb -o $@
 
 clean:
 	rm -f $(LIBDB) $(LIBDBSO) $(OBJS) $(SHOBJS)
 
 OORG=	-O2
-CL=	$(CC) -Wall -c -D__DBINTERFACE_PRIVATE $(OORG) -I. -Iinclude
+LINK.so = $(LINK.c) $(SO_CFLAGS) $(SO_LDFLAGS)
+CL=	$(COMPILE.c) -Wall -c -D__DBINTERFACE_PRIVATE $(OORG) -I. -Iinclude
+SOCL=	$(LINK.so) -Wall -c -D__DBINTERFACE_PRIVATE $(OORG) -I. -Iinclude
 
 db_dump185.o: db_dump185.c
-	$(CL) -o $@ $<
+	$(CL) $< -o $@
 %.o: hash/%.c
-	$(CL) -Ihash -o $@ $<
-%.os: hash/%.c
-	$(CL) -Ihash -fPIC -o $@ $<
+	$(CL) -Ihash $< -o $@
+%.so: hash/%.c
+	$(SOCL) -Ihash $< -o $@
 %.o: btree/%.c
-	$(CL) -Ibtree -o $@ $<
-%.os: btree/%.c
-	$(CL) -Ibtree -fPIC -o $@ $<
+	$(CL) -Ibtree $< -o $@
+%.so: btree/%.c
+	$(SOCL) -Ibtree $< -o $@
 db.o: db/db.c
-	$(CL) -o $@ $<
-db.os: db/db.c
-	$(CL) -fPIC -o $@ $<
+	$(CL) $< -o $@
+db.so: db/db.c
+	$(SOCL) $< -o $@
 mpool.o: mpool/mpool.c
-	$(CL) -o $@ $<
-mpool.os: mpool/mpool.c
-	$(CL) -fPIC -o $@ $<
+	$(CL) $< -o $@
+mpool.so: mpool/mpool.c
+	$(SOCL) $< -o $@
 %.o: recno/%.c
-	$(CL) -Irecno -o $@ $<
-%.os: recno/%.c
-	$(CL) -Irecno -fPIC -o $@ $<
+	$(CL) -Irecno $< -o $@
+%.so: recno/%.c
+	$(SOCL) -Irecno $< -o $@
Index: formats/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- formats/Makefile	22 Apr 2004 03:34:13 -0000	1.17
+++ formats/Makefile	25 Jun 2004 02:41:22 -0000
@@ -11,6 +11,9 @@
 # the GNU General Public License
 #
 
+TOPDIR=..
+include $(TOPDIR)/Makefile.inc
+
 FORMAT_LIBS=format_gsm.so format_wav.so \
 	format_wav_gsm.so format_vox.so format_pcm.so format_g729.so \
 	format_pcm_alaw.so format_h263.so format_g726.so format_ilbc.so
@@ -20,29 +23,23 @@
 #
 #FORMAT_LIBS+=format_g723.so
 
-GSMLIB=../codecs/gsm/lib/libgsm.a
+GSMLIB=$(TOPDIR)/codecs/gsm/lib/libgsm.a
 
-CFLAGS+=-fPIC
+# note: use $(SO_CFLAGS) to ensure that all objects in this directory
+# are compatible with dynamic and shared linking.
+CFLAGS+= $(SO_CFLAGS)
 
 all: depend $(FORMAT_LIBS)
 
 clean:
 	rm -f *.so *.o .depend
 
-%.so : %.o
-	$(CC) $(SOLINK) -o $@ $<
-
-ifneq ($(wildcard .depend),)
-include .depend
-endif
-
-format_mp3.so : format_mp3.o
-	$(CC) $(SOLINK) -o $@ $< -lm
+format_mp3.so : format_mp3.c
+	$(LINK.so) $^ $(LOADLIBES) $(LDLIBS) -lm -o $@
 
 install: all
 	for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 
-depend: .depend
-
-.depend:
-	../mkdep $(CFLAGS) `ls *.c`
+ifneq ($(wildcard .depend),)
+include .depend
+endif
Index: pbx/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- pbx/Makefile	26 Oct 2003 18:50:49 -0000	1.10
+++ pbx/Makefile	25 Jun 2004 02:41:22 -0000
@@ -11,7 +11,8 @@
 # the GNU General Public License
 #
 
-
+TOPDIR=..
+include $(TOPDIR)/Makefile.inc
 
 PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so     # pbx_gtkconsole.so pbx_kdeconsole.so
 
@@ -20,16 +21,21 @@
 # Add KDE Console if appropriate
 #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so")
 
-
 GTK_FLAGS=`gtk-config --cflags gthread`
 GTK_LIBS=`gtk-config --libs gthread`
-#CXX=egcs
 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 
+KDE_CONSOLE_SRCS=pbx_kdeconsole_main.c pbx_kdeconsole.c
+
+# note: use $(SO_CFLAGS) to ensure that all objects in this directory
+# are compatible with dynamic and shared linking.
+CFLAGS+= $(SO_CFLAGS)
+
+%.moc : %.h
+	$(MOC) $< -o $@
 
 all: depend $(PBX_LIBS)
 
@@ -37,34 +43,23 @@
 	rm -f *.so *.o .depend
 
 pbx_gtkconsole.o: pbx_gtkconsole.c
-	$(CC) $(CFLAGS) $(GTK_FLAGS) -c -o $@ $<
+	$(COMPILE.c) $(GTK_FLAGS) -c $< -o $@
 
-pbx_gtkconsole.so: pbx_gtkconsole.o
-	$(CC) $(SOLINK) -o $@ $< $(GTK_LIBS)
+pbx_gtkconsole.so: pbx_gtkconsole.c
+	$(LINK.so) $^ $(LOADLIBES) $(LDLIBS) $(GTK_LIBS) -o $@
 
 pbx_kdeconsole.o: pbx_kdeconsole.cc pbx_kdeconsole.moc
-	$(CXX) $(CFLAGS) $(KDE_FLAGS) -c -o $@ $<
+	$(COMPILE.cc) $(KDE_FLAGS) -c $< -o $@
 
 pbx_kdeconsole_main.o: pbx_kdeconsole_main.cc pbx_kdeconsole.h
-	$(CXX) $(CFLAGS) $(KDE_FLAGS) -c -o $@ $<
+	$(COMPILE.cc) $(KDE_FLAGS) -c $< -o $@
 
-pbx_kdeconsole.so: $(KDE_CONSOLE_OBJS)
-	$(CC) $(SOLINK) -o $@ $(KDE_CONSOLE_OBJS) $(KDE_LIBS)
-
-%.moc : %.h
-	$(MOC) $< -o $@
+pbx_kdeconsole.so: $(KDE_CONSOLE_SRCS)
+	$(LINK.so) $^ $(KDE_LIBS) -o $@
 
-%.so : %.o
-	$(CC) $(SOLINK) -o $@ $<
+install: all
+	for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 
 ifneq ($(wildcard .depend),)
 include .depend
 endif
-
-install: all
-	for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-
-depend: .depend
-
-.depend:
-	../mkdep $(CFLAGS) `ls *.c`
Index: res/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/res/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- res/Makefile	11 Jun 2004 00:12:35 -0000	1.15
+++ res/Makefile	25 Jun 2004 02:41:22 -0000
@@ -11,45 +11,36 @@
 # the GNU General Public License
 #
 
+TOPDIR=..
+include $(TOPDIR)/Makefile.inc
+
 MODS=res_adsi.so res_parking.so res_crypto.so res_musiconhold.so res_indications.so res_monitor.so
 MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi)
 MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi)
 
 CRYPTO_LIBS=-lssl -lcrypto
 
-CFLAGS+=
-CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH")
-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH")
+CPPFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH")
+CPPFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH")
 #
 # Work around buggy RedHat 9.0
 #
-CFLAGS+=-DOPENSSL_NO_KRB5 -fPIC
+CPPFLAGS+=-DOPENSSL_NO_KRB5
 
 all: depend $(MODS)
 
 install: all
 	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 
-res_crypto.so: res_crypto.o
-	$(CC) $(SOLINK) -o $@ $< $(CRYPTO_LIBS)
+res_crypto.so: res_crypto.c
+	$(LINK.so) $(CRYPTO_LIBS) $^ -o $@
 
 clean:
 	rm -f *.so *.o .depend
 
-res_odbc.so: res_odbc.o
-	$(CC) $(SOLINK) -o $@ $< -lodbc
-
-%.so : %.o
-	$(CC) $(SOLINK) -o $@ $<
+res_odbc.so: res_odbc.c
+	$(LINK.so) $^ -lodbc -o $@ $< -o $@
 
 ifneq ($(wildcard .depend),)
 include .depend
 endif
-
-depend: .depend
-
-.depend:
-	../mkdep $(CFLAGS) `ls *.c`
-
-env:
-	env
Index: stdtime/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/stdtime/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- stdtime/Makefile	5 Nov 2003 06:19:41 -0000	1.4
+++ stdtime/Makefile	25 Jun 2004 02:41:23 -0000
@@ -1,3 +1,7 @@
+
+TOPDIR=..
+include $(TOPDIR)/Makefile.inc
+
 OBJS=localtime.o
 
 all: libtime.a
@@ -11,13 +15,8 @@
 clean:
 	rm -f libtime.a *.o test .depend
 
-depend: .depend
-
-.depend:
-	../mkdep $(CFLAGS) *.c
-
 test: test.c
-	${CC} ${CFLAGS} -o test test.c
+	$(LINK.c) -o test test.c
 
 ifneq ($(wildcard .depend),)
 include .depend