silly people that don't want to install/run autoconf :-)
[asterisk/asterisk.git] / Makefile
old mode 100755 (executable)
new mode 100644 (file)
index 815644f..87c9bfd
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # 
 # Top level Makefile
 #
-# Copyright (C) 1999-2005, Mark Spencer
+# Copyright (C) 1999-2006, Digium, Inc.
 #
 # Mark Spencer <markster@digium.com>
 #
 
 # Create OPTIONS variable
 OPTIONS=
+
 # If cross compiling, define these to suit
-# CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
-# CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
-# CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
+#CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
+#CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
+#CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
+#CROSS_ARCH=Linux
+#CROSS_PROC=arm
+#SUB_PROC=xscale # or maverick
+
+# Pentium Pro Optimize
+#PROC=i686
+
+# Pentium & VIA processors optimize
+#PROC=i586
+
+#PROC=k6
+#PROC=ppc
+
 CC=$(CROSS_COMPILE)gcc
 HOST_CC=gcc
-# CROSS_ARCH=Linux
-# CROSS_PROC=arm
-# SUB_PROC=xscale # or maverick
 
 ifeq ($(CROSS_COMPILE),)
   OSARCH=$(shell uname -s)
-  OSREV=$(shell uname -r)
+  PROC?=$(shell uname -m)
 else
   OSARCH=$(CROSS_ARCH)
-  OSREV=$(CROSS_REV)
+  PROC=$(CROSS_PROC)
 endif
 
+PWD=$(shell pwd)
+
 # Remember the MAKELEVEL at the top
 MAKETOPLEVEL?=$(MAKELEVEL)
 
-ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
-######### 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.  
+ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
+# 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 code
+# Tell gcc to optimize the code
 OPTIMIZE+=-O6
+else
+  # Stack backtraces, while useful for debugging, are incompatible with optimizations
+  ifeq (${OSARCH},Linux)
+    CFLAGS+=-DSTACK_BACKTRACES
+  endif
 endif
 
-#Overwite config files on "make samples"
+# Overwite config files on "make samples"
 OVERWRITE=y
 
-#Include debug and macro symbols in the executables (-g) and profiling info (-pg)
+# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
 DEBUG=-g3 #-pg
 
-#Set NOCRYPTO to yes if you do not want to have crypto support or 
-#dependencies
+# Set NOCRYPTO to yes if you do not want to have crypto support or dependencies
 #NOCRYPTO=yes
 
 # If you are running a radio application, define RADIO_RELAX so that the DTMF
@@ -63,24 +80,23 @@ DEBUG=-g3 #-pg
 
 # If you don't have a lot of memory (e.g. embedded Asterisk), define LOW_MEMORY
 # to reduce the size of certain static buffers
-
 #ifneq ($(CROSS_COMPILE),)
 #OPTIONS += -DLOW_MEMORY
 #endif
 
+# Asterisk SMDI integration
+WITH_SMDI = 1
+
 # Optional debugging parameters
 DEBUG_THREADS = #-DDUMP_SCHEDULER #-DDEBUG_SCHEDULER #-DDEBUG_THREADS #-DDO_CRASH #-DDETECT_DEADLOCKS
 
+# If you want to debug channel locking, try this (depends on code using
+# ast_channel_lock and companions to work)
+DEBUG_THREADS += #-DDEBUG_CHANNEL_LOCKS
+
 # 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?=
@@ -89,7 +105,7 @@ INSTALL_PREFIX?=
 # Files are copied here temporarily during the install process
 # For example, make DESTDIR=/tmp/asterisk woud put things in
 # /tmp/asterisk/etc/asterisk
-# XXX watch out, put no spaces or comments after the value
+# !!! Watch out, put no spaces or comments after the value !!!
 DESTDIR?=
 #DESTDIR?=/tmp/asterisk
 
@@ -101,85 +117,103 @@ 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)
+# Enforce the detection of busy signal (get rid of false hangups)
 # Don't use together with -DBUSYDETECT_TONEONLY
 BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
 
-ifneq ($(OSARCH),SunOS)
-  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
-  ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
-  MODULES_DIR=$(ASTLIBDIR)/modules
-  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
-else
+# Define standard directories for various platforms
+# These apply if they are not redefined in asterisk.conf 
+ifeq ($(OSARCH),SunOS)
+  ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk
   ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib
   ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib
-  ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk
   ASTSPOOLDIR=$(INSTALL_PREFIX)/var/opt/asterisk/spool
   ASTLOGDIR=$(INSTALL_PREFIX)/var/opt/asterisk/log
   ASTHEADERDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/include/asterisk
-  ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
   ASTBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/bin
   ASTSBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/sbin
   ASTVARRUNDIR=$(INSTALL_PREFIX)/var/opt/asterisk/run
   ASTMANDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/share/man
-  MODULES_DIR=$(ASTLIBDIR)/modules
-  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
+else
+ifeq ($(OSARCH),FreeBSD)
+  PREFIX?=/usr/local
+  ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
+  ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
+  ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
+  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
+  ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
+  ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
+  ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
+  ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
+  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+  ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
+else
+  ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
+  ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
+  ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
+  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
+  ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
+  ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
+  ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
+  ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
+  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+  ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
 endif
+endif
+ASTDATADIR?=$(ASTVARLIBDIR)
 
-ASTCFLAGS=
-
-# Pentium Pro Optimize
-#PROC=i686
+# Asterisk.conf is located in ASTETCDIR or by using the -C flag
+# when starting Asterisk
+ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
+MODULES_DIR=$(ASTLIBDIR)/modules
+AGI_DIR=$(ASTDATADIR)/agi-bin
 
-# Pentium & VIA processors optimize
-#PROC=i586
+# If you use Apache, you may determine by a grep 'DocumentRoot' of your httpd.conf file
+HTTP_DOCSDIR=/var/www/html
+# Determine by a grep 'ScriptAlias' of your Apache httpd.conf file
+HTTP_CGIDIR=/var/www/cgi-bin
 
-#PROC=k6
-#PROC=ppc
+ASTCFLAGS=
 
-#Uncomment this to use the older DSP routines
+# Uncomment this to use the older DSP routines
 #ASTCFLAGS+=-DOLD_DSP_ROUTINES
 
-# Determine by a grep 'DocumentRoot' of your httpd.conf file
-HTTP_DOCSDIR=/var/www/html
-# Determine by a grep 'ScriptAlias' of your httpd.conf file
-HTTP_CGIDIR=/var/www/cgi-bin
-
 # If the file .asterisk.makeopts is present in your home directory, you can
-# include all of your favorite Makefile options so that every time you download
-# a new version of Asterisk, you don't have to edit the makefile to set them. 
-# The file, /etc/asterisk.makeopts will also be included, but can be overridden
+# include all of your favorite menuselect options so that every time you download
+# a new version of Asterisk, you don't have to run menuselect to set them. 
+# The file /etc/asterisk.makeopts will also be included but can be overridden
 # by the file in your home directory.
 
-ifneq ($(wildcard /etc/asterisk.makeopts),)
-  include /etc/asterisk.makeopts
+GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
+USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
+
+ifneq ($(wildcard menuselect.makeopts),)
+  include menuselect.makeopts
 endif
 
-ifneq ($(wildcard ~/.asterisk.makeopts),)
-  include ~/.asterisk.makeopts
+ifneq ($(wildcard makeopts),)
+  include makeopts
 endif
 
-ifeq ($(OSARCH),Linux)
-  ifeq ($(CROSS_COMPILE),)
-    PROC?=$(shell uname -m)
-  else
-    PROC=$(CROSS_PROC)
-  endif
+ASTCFLAGS+=$(MENUSELECT_CFLAGS)
+TOPDIR_CFLAGS=-include include/autoconfig.h -Iinclude
+MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
+OTHER_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
 
+#   *CLI> show memory allocations [filename]
+#   *CLI> show memory summary [filename]
+ifneq ($(findstring -DMALLOC_DEBUG,$(ASTCFLAGS)),)
+  TOPDIR_CFLAGS+=-include include/asterisk/astmm.h
+  MOD_SUBDIR_CFLAGS+=-include ../include/asterisk/astmm.h
+endif
+
+MOD_SUBDIR_CFLAGS+=-fPIC
+
+ifeq ($(OSARCH),Linux)
   ifeq ($(PROC),x86_64)
     # You must have GCC 3.4 to use k8, otherwise use athlon
     PROC=k8
     #PROC=athlon
-    OPTIONS+=-m64
   endif
 
   ifeq ($(PROC),sparc64)
@@ -200,30 +234,37 @@ ifeq ($(OSARCH),Linux)
       OPTIONS+=-fsigned-char -mcpu=ep9312
     else
       ifeq ($(SUB_PROC),xscale)
-        OPTIONS+=-fsigned-char -msoft-float -mcpu=xscale
+        OPTIONS+=-fsigned-char -mcpu=xscale
       else
-        OPTIONS+=-fsigned-char -msoft-float 
+        OPTIONS+=-fsigned-char 
       endif
     endif
   endif
   MPG123TARG=linux
 endif
 
-PWD=$(shell pwd)
 GREP=grep
+ID=id
 
 ifeq ($(OSARCH),SunOS)
   GREP=/usr/xpg4/bin/grep
   M4=/usr/local/bin/m4
+  ID=/usr/xpg4/bin/id
 endif
 
-INCLUDE+=-Iinclude -I../include
-ASTCFLAGS+=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
+ASTCFLAGS+=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) #-DMAKE_VALGRIND_HAPPY
 ASTCFLAGS+=$(OPTIMIZE)
+
+ifeq ($(AST_DEVMODE),yes)
+  ASTCFLAGS+=-Werror -Wunused
+endif
+
+ifeq ($(shell gcc -v 2>&1 | grep 'gcc version' | cut -f3 -d' ' | cut -f1 -d.),4)
+ASTCFLAGS+= -Wno-pointer-sign
+endif
 ASTOBJ=-o asterisk
 
 ifeq ($(findstring BSD,$(OSARCH)),BSD)
-  PROC=$(shell uname -m)
   ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
 endif
 
@@ -235,14 +276,6 @@ ifeq ($(PROC),ppc)
   ASTCFLAGS+=-fsigned-char
 endif
 
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),)
-  ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/local/include/osp
-else
-  ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
-    ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp
-  endif
-endif
-
 ifeq ($(OSARCH),FreeBSD)
   BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk)
   ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
@@ -251,22 +284,6 @@ ifeq ($(OSARCH),FreeBSD)
     ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp
   endif
   MPG123TARG=freebsd
-
-  # XXX FreeBSD paths
-  PREFIX?=/usr/local
-  ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
-  ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
-  ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
-  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
-  ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
-  ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
-  ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
-  ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
-  ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
-  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
-  ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
-  # XXX end FreeBSD paths
-
 endif # FreeBSD
 
 ifeq ($(OSARCH),NetBSD)
@@ -284,43 +301,26 @@ ifeq ($(OSARCH),SunOS)
   INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include
 endif
 
-ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN)
-  CYGLOADER=cygwin_a
-  OSARCH=CYGWIN
-  ASTOBJ=-shared -o asterisk.dll -Wl,--out-implib=libasterisk.dll.a -Wl,--export-all-symbols
-  ASTLINK=
-  LIBS+=-lpthread -lncurses -lm -lresolv
-  ASTSBINDIR=$(MODULES_DIR)
-  PROC=$(shell uname -m)
-endif
-
-ifndef WITHOUT_ZAPTEL
-
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
-  ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
-endif
-
-endif # WITHOUT_ZAPTEL
-
 LIBEDIT=editline/libedit.a
 
+ASTERISKVERSION:=$(shell build_tools/make_version .)
+
 ifneq ($(wildcard .version),)
-  ASTERISKVERSION=$(shell cat .version)
-  ASTERISKVERSIONNUM=$(shell awk -F. '{printf "%02d%02d%02d", $$1, $$2, $$3}' .version)
-  RPMVERSION=$(shell sed 's/[-\/:]/_/g' .version)
+  ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%02d%02d%02d", $$1, $$2, $$3}' .version)
+  RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
 else
   RPMVERSION=unknown
 endif
 
-ifneq ($(wildcard CVS),)
+# CVS mirrors of SVN have .svnrevision files showing
+# which SVN revision they are based on, and .svnbranch
+# showing the branch they are made from
+ifneq ($(wildcard .svnrevision),)
   ASTERISKVERSIONNUM=999999
-  ifneq ($(wildcard CVS/Tag),)
-    ASTERISKVERSION=$(shell echo "CVS-`sed 's/^T//g' CVS/Tag`-`date +"%D-%T"`")
-  else
-    ASTERISKVERSION=CVS HEAD
-  endif
 else
-  ASTERISKVERSIONNUM=000000
+  ifneq ($(wildcard .svn),)
+    ASTERISKVERSIONNUM=999999
+  endif
 endif
 
 ASTCFLAGS+= $(DEBUG_THREADS)
@@ -328,18 +328,31 @@ ASTCFLAGS+= $(TRACE_FRAMES)
 ASTCFLAGS+= $(MALLOC_DEBUG)
 ASTCFLAGS+= $(BUSYDETECT)
 ASTCFLAGS+= $(OPTIONS)
+ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
 ASTCFLAGS+= -fomit-frame-pointer 
-SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
+endif
+
+MOD_SUBDIRS=res channels pbx apps codecs formats cdr funcs
+SUBDIRS:=$(MOD_SUBDIRS) utils stdtime agi
 
 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 \
+       translate.o file.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 \
+       cdr.o tdd.o acl.o rtp.o udptl.o manager.o asterisk.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 plc.o jitterbuf.o dnsmgr.o devicestate.o \
        netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
-       cryptostub.o
+       cryptostub.o sha1.o http.o
+
+# we need to link in the objects statically, not as a library, because
+# otherwise modules will not have them available if none of the static
+# objects use it.
+OBJS+= stdtime/localtime.o
+
+# At the moment say.o is an optional component which can be overridden
+# by a module.
+OBJS+= say.o
 
 ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),)
   OBJS+= poll.o
@@ -352,9 +365,9 @@ ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),)
 endif
 
 ifeq ($(OSARCH),Linux)
-  LIBS+=-ldl -lpthread -lncurses -lm -lresolv  #-lnjamd
+  LIBS+=-ldl -lpthread $(EDITLINE_LIBS) -lm -lresolv  #-lnjamd
 else
-  LIBS+=-lncurses -lm
+  LIBS+=$(EDITLINE_LIBS) -lm
 endif
 
 ifeq ($(OSARCH),Darwin)
@@ -363,12 +376,18 @@ ifeq ($(OSARCH),Darwin)
   AUDIO_LIBS=-framework CoreAudio
   ASTLINK=-Wl,-dynamic
   SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
-  OBJS+=poll.o
-  ASTCFLAGS+=-DPOLLCOMPAT
+  # Mac on Intel CoreDuo does not need poll compatibility layer
+  ifneq ($(PROC),i386)
+    OBJS+=poll.o
+    ASTCFLAGS+=-DPOLLCOMPAT
+  endif
 else
-#These are used for all but Darwin
+# These are used for all but Darwin
   ASTLINK=-Wl,-E 
   SOLINK=-shared -Xlinker -x
+  ifeq ($(findstring BSD,$(OSARCH)),BSD)
+    SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
+  endif
 endif
 
 ifeq ($(OSARCH),FreeBSD)
@@ -376,11 +395,11 @@ ifeq ($(OSARCH),FreeBSD)
 endif
 
 ifeq ($(OSARCH),NetBSD)
-  LIBS+=-lpthread -lcrypto -lm -L$(CROSS_COMPILE_TARGET)/usr/pkg/lib -lncurses
+  LIBS+=-lpthread -lcrypto -lm -L$(CROSS_COMPILE_TARGET)/usr/pkg/lib $(EDITLINE_LIBS)
 endif
 
 ifeq ($(OSARCH),OpenBSD)
-  LIBS+=-lcrypto -lpthread -lm -lncurses
+  LIBS+=-lcrypto -lpthread -lm $(EDITLINE_LIBS)
 endif
 
 ifeq ($(OSARCH),SunOS)
@@ -391,18 +410,16 @@ ifeq ($(OSARCH),SunOS)
 endif
 
 ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
-  CFLAGS+=$(ASTCFLAGS)
+  CFLAGS+=$(TOPDIR_CFLAGS) $(ASTCFLAGS)
 endif
 
 # This is used when generating the doxygen documentation
-ifneq ($(wildcard /usr/local/bin/dot)$(wildcard /usr/bin/dot),)
+ifneq ($(DOT),:)
   HAVEDOT=yes
 else
   HAVEDOT=no
 endif
 
-LIBS+=-lssl
-
 INSTALL=install
 
 _all: all
@@ -411,10 +428,32 @@ _all: all
        @echo " + cannot be run before being installed by   +"  
        @echo " + running:                                  +"  
        @echo " +                                           +"
-       @echo " +               $(MAKE) install                +"  
+       @echo " +               make install                +"  
        @echo " +-------------------------------------------+"  
 
-all: cleantest depend asterisk subdirs 
+all: config.status menuselect.makeopts cleantest depend asterisk subdirs
+
+configure:
+       -@./bootstrap.sh
+
+config.status: configure
+       @CFLAGS="" ./configure
+       @echo "****"
+       @echo "**** The configure script was just executed, so 'make' needs to be"
+       @echo "**** restarted."
+       @echo "****"
+       @exit 1
+
+makeopts: configure
+       @CFLAGS="" ./configure
+       @echo "****"
+       @echo "**** The configure script was just executed, so 'make' needs to be"
+       @echo "**** restarted."
+       @echo "****"
+       @exit 1
+
+menuselect.makeopts: build_tools/menuselect makeopts.xml
+       @build_tools/menuselect --check-deps ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} $@
 
 #ifneq ($(wildcard tags),)
 ctags: tags
@@ -424,22 +463,15 @@ ifneq ($(wildcard TAGS),)
 all: TAGS
 endif
 
-noclean: depend asterisk subdirs
-
 editline/config.h:
-       cd editline && unset CFLAGS LIBS && ./configure ; \
+       cd editline && unset CFLAGS LIBS && CFLAGS="$(OPTIMIZE)" ./configure ; \
 
-editline/libedit.a: FORCE
-       cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
+editline/libedit.a:
+       cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
        $(MAKE) -C editline libedit.a
 
-db1-ast/libdb1.a: FORCE
-       @if [ -d db1-ast ]; then \
-               $(MAKE) -C db1-ast libdb1.a ; \
-       else \
-               echo "You need to do a cvs update -d not just cvs update"; \
-               exit 1; \
-       fi
+db1-ast/libdb1.a:
+       $(MAKE) -C db1-ast libdb1.a
 
 ifneq ($(wildcard .depend),)
   include .depend
@@ -450,10 +482,10 @@ ifneq ($(wildcard .tags-depend),)
 endif
 
 ast_expr2.c:
-       bison -d --name-prefix=ast_yy ast_expr2.y -o ast_expr2.c
+       bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
 
 ast_expr2f.c:
-       flex --full ast_expr2.fl
+       flex -o $@ --full ast_expr2.fl
 
 testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
        gcc -g -c -DSTANDALONE ast_expr2f.c
@@ -481,32 +513,24 @@ asterisk.html: asterisk.sgml
 asterisk.txt: asterisk.sgml
        docbook2txt asterisk.sgml
 
-defaults.h: FORCE
+defaults.h: makeopts
        build_tools/make_defaults_h > $@.tmp
        if cmp -s $@.tmp $@ ; then echo ; else \
                mv $@.tmp $@ ; \
        fi
        rm -f $@.tmp
 
-include/asterisk/version.h: FORCE
+include/asterisk/version.h:
        build_tools/make_version_h > $@.tmp
        if cmp -s $@.tmp $@ ; then echo; else \
                mv $@.tmp $@ ; \
        fi
        rm -f $@.tmp
 
-stdtime/libtime.a: FORCE
-       @if [ -d stdtime ]; then \
-               $(MAKE) -C stdtime libtime.a ; \
-       else \
-               echo "You need to do a cvs update -d not just cvs update"; \
-               exit 1; \
-       fi
-
-cygwin_a:
-       $(MAKE) -C cygwin all
+stdtime/libtime.a:
+       CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C stdtime libtime.a
 
-asterisk: $(CYGLOADER) editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
+asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
        build_tools/make_build_h > include/asterisk/build.h.tmp
        if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \
                mv include/asterisk/build.h.tmp include/asterisk/build.h ; \
@@ -519,54 +543,76 @@ muted: muted.o
        $(CC) $(AUDIO_LIBS) -o muted muted.o
 
 subdirs: 
-       for x in $(SUBDIRS); do $(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) $(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C utils
+       CFLAGS="$(ASTCFLAGS) $(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C agi
 
-clean:
+clean-depend:
+       for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done
+       rm -f .depend .tags-depend
+
+clean: clean-depend
        for x in $(SUBDIRS); do $(MAKE) -C $$x clean || exit 1 ; done
-       rm -f *.o *.so asterisk .depend
+       rm -f *.o *.so asterisk
        rm -f defaults.h
        rm -f include/asterisk/build.h
        rm -f include/asterisk/version.h
-       rm -f .tags-depend .tags-sources tags TAGS
+       rm -f .tags-sources tags TAGS
        @if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
        @if [ -d mpg123-0.59r ]; then $(MAKE) -C mpg123-0.59r clean; fi
        $(MAKE) -C db1-ast clean
        $(MAKE) -C stdtime clean
 
+distclean: dist-clean
+
+dist-clean: clean
+       rm -f menuselect.makeopts makeopts makeopts.xml
+       rm -f config.log config.status
+       rm -f include/autoconfig.h
+       $(MAKE) -C mxml clean
+       $(MAKE) -C build_tools dist-clean
+
 datafiles: all
-       if test $$(id -u) = 0; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
-       mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
-       mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
+       if [ x`$(ID) -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+# Should static HTTP be installed during make samples or even with its own target ala
+# webvoicemail?  There are portions here that *could* be customized but might also be
+# improved a lot.  I'll put it here for now.
+       mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
+       for x in static-http/*; do \
+               $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
+       done
+       mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/digits
+       mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/priv-callerintros
        for x in sounds/digits/*.gsm; do \
                if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-                       $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
+                       $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/digits ; \
                else \
                        echo "No description for $$x"; \
                        exit 1; \
                fi; \
        done
-       mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate
+       mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/dictate
        for x in sounds/dictate/*.gsm; do \
                if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-                       $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \
+                       $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/dictate ; \
                else \
                        echo "No description for $$x"; \
                        exit 1; \
                fi; \
        done
-       mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
+       mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/letters
        for x in sounds/letters/*.gsm; do \
                if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-                       $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
+                       $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/letters ; \
                else \
                        echo "No description for $$x"; \
                        exit 1; \
                fi; \
        done
-       mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
+       mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/phonetic
        for x in sounds/phonetic/*.gsm; do \
                if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-                       $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
+                       $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/phonetic ; \
                else \
                        echo "No description for $$x"; \
                        exit 1; \
@@ -574,31 +620,31 @@ datafiles: all
        done
        for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \
                if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-                       $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+                       $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
                else \
                        echo "No description for $$x"; \
                        exit 1; \
                fi; \
        done
-       mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
-       mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images
+       mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3
+       mkdir -p $(DESTDIR)$(ASTDATADIR)/images
        for x in images/*.jpg; do \
-               $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
+               $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
        done
        mkdir -p $(DESTDIR)$(AGI_DIR)
 
 update: 
-       @if [ -d CVS ]; then \
-               if [ -f patches/.applied ]; then \
-                       patches=`cat patches/.applied`; \
-               fi; \
-               if [ ! -z "$$patches" ]; then \
-                       for x in $$patches; do \
-                               echo "Unapplying $$x..."; \
-                               patch -R -p0 < patches/$$x; \
-                       done; \
-                       rm -f patches/.applied; \
+       @if [ -d .svn ]; then \
+               echo "Updating from Subversion..." ; \
+               svn update | tee update.out; \
+               rm -f .version; \
+               if [ `grep -c ^C update.out` -gt 0 ]; then \
+                       echo ; echo "The following files have conflicts:" ; \
+                       grep ^C update.out | cut -b4- ; \
                fi ; \
+               rm -f update.out; \
+               $(MAKE) clean-depend; \
+       elif [ -d CVS ]; then \
                echo "Updating from CVS..." ; \
                cvs -q -z3 update -Pd | tee update.out; \
                rm -f .version; \
@@ -607,19 +653,9 @@ update:
                        grep ^C update.out | cut -d' ' -f2- ; \
                fi ; \
                rm -f update.out; \
-               if [ ! -z "$$patches" ]; then \
-                       for x in $$patches; do \
-                               if [ -f patches/$$x ]; then \
-                                       echo "Applying patch $$x..."; \
-                                       patch -p0 < patches/$$x; \
-                                       echo $$x >> patches/.applied; \
-                               else \
-                                       echo "Patch $$x no longer relevant"; \
-                               fi; \
-                       done; \
-               fi; \
+               $(MAKE) clean-depend; \
        else \
-               echo "Not CVS";  \
+               echo "Not under version control";  \
        fi
 
 NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
@@ -638,7 +674,6 @@ bininstall: all
        mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
        mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
        if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
-       if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
        if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
        ln -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
        $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
@@ -647,55 +682,33 @@ bininstall: all
                cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
                chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
        fi
-       for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
        $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
        $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
        if [ -n "$(OLDHEADERS)" ]; then \
                rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
        fi
-       rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail
-       mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
+       mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds
        mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
        mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
-       mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
-       mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
-       mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
+       mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
+       mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
+       mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
        mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
-       $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-       $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+       $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
+       $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
        $(INSTALL) -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
        $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
        $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
        $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
        if [ -d contrib/firmware/iax ]; then \
-               $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
+               $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
        else \
                echo "You need to do cvs update -d not just cvs update" ; \
        fi 
-       ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
        if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
-       @echo " +---- Asterisk Installation Complete -------+"  
-       @echo " +                                           +"
-       @echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
-       @echo " +                                           +"
-       @echo " + Asterisk has successfully been installed. +"  
-       @echo " + If you would like to install the sample   +"  
-       @echo " + configuration files (overwriting any      +"
-       @echo " + existing config files), run:              +"  
-       @echo " +                                           +"
-       @echo " +               $(MAKE) samples                +"
-       @echo " +                                           +"
-       @echo " +-----------------  or ---------------------+"
-       @echo " +                                           +"
-       @echo " + You can go ahead and install the asterisk +"
-       @echo " + program documentation now or later run:   +"
-       @echo " +                                           +"
-       @echo " +              $(MAKE) progdocs                +"
-       @echo " +                                           +"
-       @echo " + **Note** This requires that you have      +"
-       @echo " + doxygen installed on your local system    +"
-       @echo " +-------------------------------------------+"
-       @$(MAKE) -s oldmodcheck
+
+install-subdirs:
+       for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
 
 NEWMODS=$(notdir $(wildcard */*.so))
 OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
@@ -718,10 +731,32 @@ oldmodcheck:
                echo " WARNING WARNING WARNING" ;\
        fi
 
-install: all datafiles bininstall
+install: all datafiles bininstall install-subdirs
        @if [ -x /usr/sbin/asterisk-post-install ]; then \
                /usr/sbin/asterisk-post-install $(DESTDIR) . ; \
        fi
+       @echo " +---- Asterisk Installation Complete -------+"  
+       @echo " +                                           +"
+       @echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
+       @echo " +                                           +"
+       @echo " + Asterisk has successfully been installed. +"  
+       @echo " + If you would like to install the sample   +"  
+       @echo " + configuration files (overwriting any      +"
+       @echo " + existing config files), run:              +"  
+       @echo " +                                           +"
+       @echo " +               $(MAKE) samples                +"
+       @echo " +                                           +"
+       @echo " +-----------------  or ---------------------+"
+       @echo " +                                           +"
+       @echo " + You can go ahead and install the asterisk +"
+       @echo " + program documentation now or later run:   +"
+       @echo " +                                           +"
+       @echo " +              $(MAKE) progdocs                +"
+       @echo " +                                           +"
+       @echo " + **Note** This requires that you have      +"
+       @echo " + doxygen installed on your local system    +"
+       @echo " +-------------------------------------------+"
+       @$(MAKE) -s oldmodcheck
 
 upgrade: all bininstall
 
@@ -756,6 +791,7 @@ samples: adsi
                echo "astetcdir => $(ASTETCDIR)" ; \
                echo "astmoddir => $(MODULES_DIR)" ; \
                echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
+               echo "astdatadir => $(ASTDATADIR)" ; \
                echo "astagidir => $(AGI_DIR)" ; \
                echo "astspooldir => $(ASTSPOOLDIR)" ; \
                echo "astrundir => $(ASTVARRUNDIR)" ; \
@@ -767,32 +803,34 @@ samples: adsi
                echo ";astctlowner = root" ; \
                echo ";astctlgroup = apache" ; \
                echo ";astctl = asterisk.ctl" ; \
+               echo ";[options]" ; \
+               echo ";internal_timing = yes" ; \
                ) > $(DESTDIR)$(ASTCONFPATH) ; \
        else \
                echo "Skipping asterisk.conf creation"; \
        fi
-       mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+       mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds ; \
        for x in sounds/demo-*; do \
                if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-                       $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+                       $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
                else \
                        echo "No description for $$x"; \
                        exit 1; \
                fi; \
        done
-       mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
+       mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3 ; \
        for x in sounds/*.mp3; do \
-               $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
+               $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/mohmp3 ; \
        done
-       rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
+       rm -f $(DESTDIR)$(ASTDATADIR)/mohmp3/sample-hold.mp3
        mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
        :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
        for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
-               cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
+               cat $(DESTDIR)$(ASTDATADIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
        done
        :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm
        for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone; do \
-               cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm ; \
+               cat $(DESTDIR)$(ASTDATADIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm ; \
        done
 
 webvmail:
@@ -832,12 +870,12 @@ __rpm: include/asterisk/version.h spec
        $(MAKE) DESTDIR=/tmp/asterisk install ; \
        $(MAKE) DESTDIR=/tmp/asterisk samples ; \
        mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
-       cp -f redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \
+       cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \
        rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
 
 progdocs:
        (cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \
-       echo "PROJECT_NUMBER=$(ASTERISKVERSION)  -  $(ASTERISKVERSIONNUM)") | doxygen - 
+       echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen - 
 
 mpg123:
        @wget -V >/dev/null || (echo "You need wget" ; false )
@@ -846,21 +884,39 @@ mpg123:
        $(MAKE) -C mpg123-0.59r $(MPG123TARG)
 
 config:
-       if [ -d /etc/rc.d/init.d ]; then \
-               $(INSTALL) -m 755 contrib/init.d/rc.redhat.asterisk /etc/rc.d/init.d/asterisk; \
-               /sbin/chkconfig --add asterisk; \
-       elif [ -d /etc/init.d ]; then \
-               $(INSTALL) -m 755 init.asterisk /etc/init.d/asterisk; \
-       fi 
+       @if [ "${OSARCH}" = "Linux" ]; then \
+               if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \
+                       $(INSTALL) -m 755 contrib/init.d/rc.redhat.asterisk /etc/rc.d/init.d/asterisk; \
+                       /sbin/chkconfig --add asterisk; \
+               elif [ -f /etc/debian_version ]; then \
+                       $(INSTALL) -m 755 contrib/init.d/rc.debian.asterisk /etc/init.d/asterisk; \
+                       /usr/sbin/update-rc.d asterisk start 10 2 3 4 5 . stop 91 2 3 4 5 .; \
+               elif [ -f /etc/gentoo-release ]; then \
+                       $(INSTALL) -m 755 contrib/init.d/rc.gentoo.asterisk /etc/init.d/asterisk; \
+                       /sbin/rc-update add asterisk default; \
+               elif [ -f /etc/mandrake-release ]; then \
+                       $(INSTALL) -m 755 contrib/init.d/rc.mandrake.asterisk /etc/rc.d/init.d/asterisk; \
+                       /sbin/chkconfig --add asterisk; \
+               elif [ -f /etc/SuSE-release -o -f /etc/novell-release ]; then \
+                       $(INSTALL) -m 755 contrib/init.d/rc.suse.asterisk /etc/init.d/asterisk; \
+                       /sbin/chkconfig --add asterisk; \
+               elif [ -f /etc/slackware-version ]; then \
+                       echo "Slackware is not currently supported, although an init script does exist for it." \
+               else \
+                       echo "We could not install init scripts for your distribution."; \
+               fi \
+       else \
+               echo "We could not install init scripts for your operating system."; \
+       fi
 
-dont-optimize: install
+dont-optimize: _all
 
 valgrind: dont-optimize
 
 depend: include/asterisk/version.h .depend defaults.h 
        for x in $(SUBDIRS); do $(MAKE) -C $$x depend || exit 1 ; done
 
-.depend: include/asterisk/version.h
+.depend: include/asterisk/version.h defaults.h
        build_tools/mkdep $(CFLAGS) $(wildcard *.c)
 
 .tags-depend:
@@ -901,53 +957,55 @@ env:
 # If the cleancount has been changed, force a make clean.
 # .cleancount is the global clean count, and .lastclean is the 
 # last clean count we had
-# We can avoid this by making noclean
 
 cleantest:
        if cmp -s .cleancount .lastclean ; then echo ; else \
                $(MAKE) clean; cp -f .cleancount .lastclean;\
        fi
 
-patchlist:
-       @echo "Experimental Patches:"
-       @for x in patches/*; do \
-               patch=`basename $$x`; \
-               if [ "$$patch" = "CVS" ]; then \
-                       continue; \
-               fi; \
-               if grep -q ^$$patch$$ patches/.applied; then \
-                       echo "$$patch (applied)"; \
-               else \
-                       echo "$$patch (available)"; \
-               fi; \
-       done
+_uninstall:
+       rm -f $(DESTDIR)$(MODULES_DIR)/*
+       rm -f $(DESTDIR)$(ASTSBINDIR)/*asterisk*
+       rm -f $(DESTDIR)$(ASTSBINDIR)/astgenkey
+       rm -f $(DESTDIR)$(ASTSBINDIR)/autosupport
+       rm -rf $(DESTDIR)$(ASTHEADERDIR)
+       rm -rf $(DESTDIR)$(ASTDATADIR)/sounds
+       rm -rf $(DESTDIR)$(ASTDATADIR)/firmware
+       rm -rf $(DESTDIR)$(ASTMANDIR)/man8
+       for x in $(SUBDIRS); do $(MAKE) -C $$x uninstall || exit 1 ; done
+
+uninstall: _uninstall
+       @echo " +--------- Asterisk Uninstall Complete -----+"  
+       @echo " + Asterisk binaries, sounds, man pages,     +"  
+       @echo " + headers, modules, and firmware builds,    +"  
+       @echo " + have all been uninstalled.                +"  
+       @echo " +                                           +"
+       @echo " + To remove ALL traces of Asterisk,         +"
+       @echo " + including configuration, spool            +"
+       @echo " + directories, and logs, run the following  +"
+       @echo " + command:                                  +"
+       @echo " +                                           +"
+       @echo " +            $(MAKE) uninstall-all             +"  
+       @echo " +-------------------------------------------+"  
 
-apply: 
-       @if [ -z "$(PATCH)" ]; then \
-               echo "Usage: make PATCH=<patchname> apply"; \
-       elif grep -q ^$(PATCH)$$ patches/.applied 2>/dev/null; then \
-               echo "Patch $(PATCH) is already applied"; \
-       elif [ -f "patches/$(PATCH)" ]; then \
-               echo "Applying patch $(PATCH)"; \
-               patch -p0 < patches/$(PATCH); \
-               echo "$(PATCH)" >> patches/.applied; \
-       else \
-               echo "No such patch $(PATCH) in patches directory"; \
-       fi
+uninstall-all: _uninstall
+       rm -rf $(DESTDIR)$(ASTLIBDIR)
+       rm -rf $(DESTDIR)$(ASTVARLIBDIR)
+       rm -rf $(DESTDIR)$(ASTDATADIR)
+       rm -rf $(DESTDIR)$(ASTSPOOLDIR)
+       rm -rf $(DESTDIR)$(ASTETCDIR)
+       rm -rf $(DESTDIR)$(ASTLOGDIR)
 
-unapply: 
-       @if [ -z "$(PATCH)" ]; then \
-               echo "Usage: make PATCH=<patchname> unapply"; \
-       elif grep -v -q ^$(PATCH)$$ patches/.applied 2>/dev/null; then \
-               echo "Patch $(PATCH) is not applied"; \
-       elif [ -f "patches/$(PATCH)" ]; then \
-               echo "Un-applying patch $(PATCH)"; \
-               patch -p0 -R < patches/$(PATCH); \
-               rm -f patches/.tmpapplied || :; \
-               mv patches/.applied patches/.tmpapplied; \
-               cat patches/.tmpapplied | grep -v ^$(PATCH)$$ > patches/.applied; \
-               rm -f patches/.tmpapplied; \
-       else \
-               echo "No such patch $(PATCH) in patches directory"; \
-       fi
+menuselect: build_tools/menuselect makeopts.xml
+       -@build_tools/menuselect ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
+
+build_tools/menuselect: build_tools/menuselect.c build_tools/menuselect_curses.c build_tools/menuselect.h include/autoconfig.h strcompat.o mxml/libmxml.a
+       $(MAKE) -C build_tools menuselect
+
+mxml/libmxml.a:
+       @cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
+       $(MAKE) -C mxml libmxml.a
 
+makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml
+       @echo "Generating list of available modules ..."
+       @build_tools/prep_moduledeps > $@