silly people that don't want to install/run autoconf :-)
[asterisk/asterisk.git] / Makefile
index 4498524..87c9bfd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ PWD=$(shell pwd)
 # Remember the MAKELEVEL at the top
 MAKETOPLEVEL?=$(MAKELEVEL)
 
-ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
+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,
@@ -97,13 +97,6 @@ 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?=
@@ -182,32 +175,45 @@ HTTP_CGIDIR=/var/www/cgi-bin
 
 ASTCFLAGS=
 
-# Define this to use files larger than 2GB (useful for sound files longer than 37 hours and logfiles)
-ASTCFLAGS+=-D_FILE_OFFSET_BITS=64
-
 # Uncomment this to use the older DSP routines
 #ASTCFLAGS+=-DOLD_DSP_ROUTINES
 
 # 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
 
+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)
@@ -228,9 +234,9 @@ 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
@@ -246,10 +252,13 @@ ifeq ($(OSARCH),SunOS)
   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)
-ASTCFLAGS+=# -Werror -Wunused
+
+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
@@ -267,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)
@@ -300,27 +301,11 @@ 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)
-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)
 else
@@ -332,11 +317,9 @@ endif
 # showing the branch they are made from
 ifneq ($(wildcard .svnrevision),)
   ASTERISKVERSIONNUM=999999
-  ASTERISKVERSION:=SVN-$(shell cat .svnbranch)-r$(shell cat .svnrevision)
 else
   ifneq ($(wildcard .svn),)
     ASTERISKVERSIONNUM=999999
-    ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name)
   endif
 endif
 
@@ -345,11 +328,12 @@ ASTCFLAGS+= $(TRACE_FRAMES)
 ASTCFLAGS+= $(MALLOC_DEBUG)
 ASTCFLAGS+= $(BUSYDETECT)
 ASTCFLAGS+= $(OPTIONS)
-ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
+ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
 ASTCFLAGS+= -fomit-frame-pointer 
 endif
 
-SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
+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 pbx.o cli.o md5.o term.o \
@@ -381,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)
@@ -411,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)
@@ -426,11 +410,11 @@ 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
@@ -438,18 +422,38 @@ endif
 
 INSTALL=install
 
-CFLAGS+=-DT38_SUPPORT
-
 _all: all
        @echo " +--------- Asterisk Build Complete ---------+"  
        @echo " + Asterisk has successfully been built, but +"  
        @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
@@ -459,16 +463,14 @@ 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
+db1-ast/libdb1.a:
        $(MAKE) -C db1-ast libdb1.a
 
 ifneq ($(wildcard .depend),)
@@ -480,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
@@ -511,27 +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
-       $(MAKE) -C stdtime libtime.a
-
-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 ; \
@@ -544,7 +543,9 @@ 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-depend:
        for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done
@@ -562,14 +563,23 @@ clean: clean-depend
        $(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 [ 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.
+# 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 ; \
+               $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
        done
        mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/digits
        mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/priv-callerintros
@@ -664,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)/
@@ -673,7 +682,6 @@ 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 \
@@ -682,44 +690,25 @@ bininstall: all
        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 
        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)))
@@ -742,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
 
@@ -873,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:
@@ -928,7 +957,6 @@ 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 \
@@ -942,7 +970,7 @@ _uninstall:
        rm -f $(DESTDIR)$(ASTSBINDIR)/autosupport
        rm -rf $(DESTDIR)$(ASTHEADERDIR)
        rm -rf $(DESTDIR)$(ASTDATADIR)/sounds
-       rm -rf $(DESTDIR)$(ASTVARLIBDIR)/firmware
+       rm -rf $(DESTDIR)$(ASTDATADIR)/firmware
        rm -rf $(DESTDIR)$(ASTMANDIR)/man8
        for x in $(SUBDIRS); do $(MAKE) -C $$x uninstall || exit 1 ; done
 
@@ -967,3 +995,17 @@ uninstall-all: _uninstall
        rm -rf $(DESTDIR)$(ASTSPOOLDIR)
        rm -rf $(DESTDIR)$(ASTETCDIR)
        rm -rf $(DESTDIR)$(ASTLOGDIR)
+
+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 > $@