CHANGES: Update changes log to include r403414 entry
[asterisk/asterisk.git] / Makefile
index 6e29271..223cafb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 #
-# Asterisk -- A telephony toolkit for Linux.
-# 
+# Asterisk -- An open source telephony toolkit.
+#
 # Top level Makefile
 #
-# Copyright (C) 1999-2006, Digium, Inc.
+# Copyright (C) 1999-2010, Digium, Inc.
 #
 # Mark Spencer <markster@digium.com>
 #
 # _ASTLDFLAGS - linker flags (not libraries) provided by the build system
 # LIBS - additional libraries, at top-level for all links,
 #      on a single object just for that object
-# SOLINK - linker flags used only for creating shared objects (.so files),
-#      used for all .so links
+# SOLINK - linker flags used only for creating dynamically loadable modules
+#          as .so files
+# DYLINK - linker flags used only for creating shared libaries
+#          (.so files on Unix-type platforms, .dylib on Darwin)
 #
 # Values for ASTCFLAGS and ASTLDFLAGS can be specified in the
 # environment when running make, as follows:
@@ -40,61 +42,65 @@ export ASTERISKVERSIONNUM
 # DESTDIR is the staging (or final) directory where files are copied
 # during the install process. Define it before 'export', otherwise
 # export will set it to the empty string making ?= fail.
+# Trying to run asterisk from the DESTDIR is completely unsupported
+# behavior.
 # WARNING: do not put spaces or comments after the value.
 DESTDIR?=$(INSTALL_PATH)
 export DESTDIR
 
-export INSTALL_PATH    # Additional prefix for the following paths
-export ASTETCDIR               # Path for config files
+export INSTALL_PATH       # Additional prefix for the following paths
+export ASTETCDIR          # Path for config files
 export ASTVARRUNDIR
-export MODULES_DIR
 export ASTSPOOLDIR
 export ASTVARLIBDIR
 export ASTDATADIR
 export ASTDBDIR
 export ASTLOGDIR
 export ASTLIBDIR
+export ASTMODDIR
 export ASTMANDIR
 export ASTHEADERDIR
-export ASTBINDIR
 export ASTSBINDIR
 export AGI_DIR
 export ASTCONFPATH
+export ASTKEYDIR
 
-export OSARCH                  # Operating system
-export PROC                    # Processor type
+export OSARCH             # Operating system
 
-export NOISY_BUILD             # Used in Makefile.rules
-export MENUSELECT_CFLAGS       # Options selected in menuselect.
-export AST_DEVMODE             # Set to "yes" for additional compiler
-                                # and runtime checks
+export NOISY_BUILD        # Used in Makefile.rules
+export MENUSELECT_CFLAGS  # Options selected in menuselect.
+export AST_DEVMODE        # Set to "yes" for additional compiler
+                          # and runtime checks
+export AST_DEVMODE_STRICT # Enables shadow warnings (-Wshadow)
 
-export SOLINK                  # linker flags for shared objects
-export STATIC_BUILD            # Additional cflags, set to -static
-                                # for static builds. Probably
-                                # should go directly to ASTLDFLAGS
+export _SOLINK            # linker flags for all shared objects
+export SOLINK             # linker flags for loadable modules
+export DYLINK             # linker flags for shared libraries
+export STATIC_BUILD       # Additional cflags, set to -static
+                          # for static builds. Probably
+                          # should go directly to ASTLDFLAGS
 
 #--- paths to various commands
+# The makeopts include below tries to set these if they're found during
+# configure.
 export CC
 export CXX
 export AR
 export RANLIB
 export HOST_CC
+export BUILD_CC
 export INSTALL
 export STRIP
 export DOWNLOAD
 export AWK
 export GREP
-export ID
 export MD5
 export WGET_EXTRA_ARGS
+export LDCONFIG
+export LDCONFIG_FLAGS
+export PYTHON
 
-# even though we could use '-include makeopts' here, use a wildcard
-# lookup anyway, so that make won't try to build makeopts if it doesn't
-# exist (other rules will force it to be built if needed)
-ifneq ($(wildcard makeopts),)
-  include makeopts
-endif
+-include makeopts
 
 # start the primary CFLAGS and LDFLAGS with any that were provided
 # to the configure script
@@ -124,50 +130,9 @@ OVERWRITE=y
 # Include debug and macro symbols in the executables (-g) and profiling info (-pg)
 DEBUG=-g3
 
-
-# Define standard directories for various platforms
-# These apply if they are not redefined in asterisk.conf 
-ifeq ($(OSARCH),SunOS)
-  ASTETCDIR=/var/etc/asterisk
-  ASTLIBDIR=/opt/asterisk/lib
-  ASTVARLIBDIR=/var/opt/asterisk
-  ASTDBDIR=$(ASTVARLIBDIR)
-  ASTKEYDIR=$(ASTVARLIBDIR)
-  ASTSPOOLDIR=/var/spool/asterisk
-  ASTLOGDIR=/var/log/asterisk
-  ASTHEADERDIR=/opt/asterisk/include
-  ASTBINDIR=/opt/asterisk/bin
-  ASTSBINDIR=/opt/asterisk/sbin
-  ASTVARRUNDIR=/var/run/asterisk
-  ASTMANDIR=/opt/asterisk/man
-else
-  ASTETCDIR=$(sysconfdir)/asterisk
-  ASTLIBDIR=$(libdir)/asterisk
-  ASTHEADERDIR=$(includedir)/asterisk
-  ASTBINDIR=$(bindir)
-  ASTSBINDIR=$(sbindir)
-  ASTSPOOLDIR=$(localstatedir)/spool/asterisk
-  ASTLOGDIR=$(localstatedir)/log/asterisk
-  ASTVARRUNDIR=$(localstatedir)/run/asterisk
-  ASTMANDIR=$(mandir)
-ifneq ($(findstring BSD,$(OSARCH)),)
-  ASTVARLIBDIR=$(prefix)/share/asterisk
-  ASTVARRUNDIR=$(localstatedir)/run/asterisk
-  ASTDBDIR=$(localstatedir)/db/asterisk
-else
-  ASTVARLIBDIR=$(localstatedir)/lib/asterisk
-  ASTDBDIR=$(ASTVARLIBDIR)
-endif
-  ASTKEYDIR=$(ASTVARLIBDIR)
-endif
-ifeq ($(ASTDATADIR),)
-  ASTDATADIR:=$(ASTVARLIBDIR)
-endif
-
 # 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
 
 # If you use Apache, you may determine by a grep 'DocumentRoot' of your httpd.conf file
@@ -175,55 +140,35 @@ HTTP_DOCSDIR=/var/www/html
 # Determine by a grep 'ScriptAlias' of your Apache httpd.conf file
 HTTP_CGIDIR=/var/www/cgi-bin
 
+# If your platform's linker expects a prefix on symbols generated from compiling C
+# source files, set LINKER_SYMBOL_PREFIX to that value. On some systems, exported symbols
+# from C source files are prefixed with '_', for example. If this value is not set
+# properly, the linker scripts that live in the '*.exports' files in various places
+# in this tree will unintentionally suppress symbols that should be visible
+# in the final binary objects.
+LINKER_SYMBOL_PREFIX=
+
 # 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 menuselect options so that every time you download
-# a new version of Asterisk, you don't have to run menuselect to set them. 
+# 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.
 
 GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
 USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
 
-MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
-OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
+MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
+OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
 
 # Create OPTIONS variable, but probably we can assign directly to ASTCFLAGS
 OPTIONS=
 
 ifeq ($(OSARCH),linux-gnu)
-  ifeq ($(PROC),x86_64)
-    # You must have GCC 3.4 to use k8, otherwise use athlon
-    PROC=k8
-    #PROC=athlon
-  endif
-
-  ifeq ($(PROC),sparc64)
-    #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
-    #This works for even old (2.96) versions of gcc and provides a small boost either way.
-    #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it.
-    #So we go lowest common available by gcc and go a step down, still a step up from
-    #the default as we now have a better instruction set to work with. - Belgarath
-    PROC=ultrasparc
-    OPTIONS+=$(shell if $(CC) -mtune=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mtune=$(PROC)"; fi)
-    OPTIONS+=$(shell if $(CC) -mcpu=v8 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mcpu=v8"; fi)
-    OPTIONS+=-fomit-frame-pointer
-  endif
-
-  ifeq ($(PROC),arm)
-    # The Cirrus logic is the only heavily shipping arm processor with a real floating point unit
-    ifeq ($(SUB_PROC),maverick)
-      OPTIONS+=-fsigned-char -mcpu=ep9312
-    else
-      ifeq ($(SUB_PROC),xscale)
-        OPTIONS+=-fsigned-char -mcpu=xscale
-      else
-        OPTIONS+=-fsigned-char 
-      endif
-    endif
-  endif
+  # flag to tell 'ldconfig' to only process specified directories
+  LDCONFIG_FLAGS=-n
 endif
 
 ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),)
@@ -236,36 +181,34 @@ ifeq ($(findstring -Wall,$(_ASTCFLAGS) $(ASTCFLAGS)),)
   _ASTCFLAGS+=-Wall
 endif
 
-_ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
+_ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_NESTED_FUNCTIONS) $(DEBUG)
+ADDL_TARGETS=
 
 ifeq ($(AST_DEVMODE),yes)
   _ASTCFLAGS+=-Werror
   _ASTCFLAGS+=-Wunused
   _ASTCFLAGS+=$(AST_DECLARATION_AFTER_STATEMENT)
   _ASTCFLAGS+=$(AST_FORTIFY_SOURCE)
-  _ASTCFLAGS+=-Wundef 
+  _ASTCFLAGS+=$(AST_TRAMPOLINES)
+  _ASTCFLAGS+=-Wundef
   _ASTCFLAGS+=-Wmissing-format-attribute
   _ASTCFLAGS+=-Wformat=2
+  ifeq ($(AST_DEVMODE_STRICT),yes)
+    _ASTCFLAGS+=-Wshadow
+  endif
+  ADDL_TARGETS+=validate-docs
 endif
 
 ifneq ($(findstring BSD,$(OSARCH)),)
   _ASTCFLAGS+=-isystem /usr/local/include
 endif
 
-ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),)
-  ifneq ($(PROC),ultrasparc)
-    _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
-  endif
-endif
-
-ifeq ($(PROC),ppc)
-  _ASTCFLAGS+=-fsigned-char
-endif
-
 ifeq ($(OSARCH),FreeBSD)
   # -V is understood by BSD Make, not by GNU make.
   BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
   _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+  # flag to tell 'ldconfig' to only process specified directories
+  LDCONFIG_FLAGS=-m
 endif
 
 ifeq ($(OSARCH),NetBSD)
@@ -280,10 +223,13 @@ ifeq ($(OSARCH),SunOS)
   _ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2 -D__EXTENSIONS__
 endif
 
-ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
-
-ifneq ($(wildcard .version),)
-  ASTERISKVERSIONNUM:=$(shell $(AWK) -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
+ifneq ($(GREP),)
+  ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) GIT=$(GIT) build_tools/make_version .)
+endif
+ifneq ($(AWK),)
+  ifneq ($(wildcard .version),)
+    ASTERISKVERSIONNUM:=$(shell $(AWK) -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
+  endif
 endif
 
 ifneq ($(wildcard .svn),)
@@ -305,26 +251,32 @@ MOD_SUBDIRS_EMBED_LIBS:=$(MOD_SUBDIRS:%=%-embed-libs)
 MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree)
 
 ifneq ($(findstring darwin,$(OSARCH)),)
-  _ASTCFLAGS+=-D__Darwin__
-  SOLINK=-bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
-  ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
-    SOLINK+=/usr/lib/bundle1.o
-  endif
+  _ASTCFLAGS+=-D__Darwin__ -mmacosx-version-min=10.6
+  _SOLINK=-mmacosx-version-min=10.6 -Xlinker -undefined -Xlinker dynamic_lookup
+  _SOLINK+=/usr/lib/bundle1.o
+  SOLINK=-bundle $(_SOLINK)
+  DYLINK=-Xlinker -dylib $(_SOLINK)
   _ASTLDFLAGS+=-L/usr/local/lib
 else
 # These are used for all but Darwin
   SOLINK=-shared
+  DYLINK=$(SOLINK)
   ifneq ($(findstring BSD,$(OSARCH)),)
     _ASTLDFLAGS+=-L/usr/local/lib
   endif
 endif
 
+# Include rpath settings
+_ASTLDFLAGS+=$(AST_RPATH)
+
 ifeq ($(OSARCH),SunOS)
   SOLINK=-shared -fpic -L/usr/local/ssl/lib -lrt
+  DYLINK=$(SOLINK)
 endif
 
 ifeq ($(OSARCH),OpenBSD)
   SOLINK=-shared -fpic
+  DYLINK=$(SOLINK)
 endif
 
 # comment to print directories during submakes
@@ -341,13 +293,6 @@ else
 SUBMAKE:=$(MAKE) --quiet --no-print-directory
 endif
 
-# This is used when generating the doxygen documentation
-ifneq ($(DOT),:)
-  HAVEDOT=yes
-else
-  HAVEDOT=no
-endif
-
 # $(MAKE) is printed in several places, and we want it to be a
 # fixed size string. Define a variable whose name has also the
 # same size, so we can easily align text.
@@ -358,18 +303,29 @@ else
 endif
 
 all: _all
-       @echo " +--------- Asterisk Build Complete ---------+"  
-       @echo " + Asterisk has successfully been built, and +"  
+       @echo " +--------- Asterisk Build Complete ---------+"
+       @echo " + Asterisk has successfully been built, and +"
        @echo " + can be installed by running:              +"
        @echo " +                                           +"
-       @echo " +               $(mK) install               +"  
-       @echo " +-------------------------------------------+"  
+       @echo " +               $(mK) install               +"
+       @echo " +-------------------------------------------+"
 
-_all: cleantest makeopts $(SUBDIRS) doc/core-en_US.xml
+full: _full
+       @echo " +--------- Asterisk Build Complete ---------+"
+       @echo " + Asterisk has successfully been built, and +"
+       @echo " + can be installed by running:              +"
+       @echo " +                                           +"
+       @echo " +               $(mK) install               +"
+       @echo " +-------------------------------------------+"
+
+
+_all: makeopts $(SUBDIRS) doc/core-en_US.xml $(ADDL_TARGETS)
+
+_full: makeopts $(SUBDIRS) doc/full-en_US.xml $(ADDL_TARGETS)
 
 makeopts: configure
        @echo "****"
-       @echo "**** The configure script must be executed before running '$(MAKE)'." 
+       @echo "**** The configure script must be executed before running '$(MAKE)'."
        @echo "****               Please run \"./configure\"."
        @echo "****"
        @exit 1
@@ -400,7 +356,7 @@ makeopts.embed_rules: menuselect.makeopts
        +@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS)
        +@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LIBS)
 
-$(SUBDIRS): main/version.c include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
+$(SUBDIRS): makeopts .lastclean main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
 
 ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
     # Non-windows:
@@ -420,36 +376,31 @@ $(D1): res
 res:   main
 endif
 
-$(MOD_SUBDIRS):
+$(MOD_SUBDIRS): makeopts
        +@_ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
 
-$(OTHER_SUBDIRS):
+$(OTHER_SUBDIRS): makeopts
        +@_ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
 
-defaults.h: makeopts
+defaults.h: makeopts .lastclean build_tools/make_defaults_h
        @build_tools/make_defaults_h > $@.tmp
        @cmp -s $@.tmp $@ || mv $@.tmp $@
        @rm -f $@.tmp
 
-main/version.c: FORCE
+main/version.c: FORCE .lastclean
        @build_tools/make_version_c > $@.tmp
        @cmp -s $@.tmp $@ || mv $@.tmp $@
        @rm -f $@.tmp
 
-include/asterisk/version.h: FORCE
-       @build_tools/make_version_h > $@.tmp
-       @cmp -s $@.tmp $@ || mv $@.tmp $@
-       @rm -f $@.tmp
-
-include/asterisk/buildopts.h: menuselect.makeopts
+include/asterisk/buildopts.h: menuselect.makeopts .lastclean
        @build_tools/make_buildopts_h > $@.tmp
        @cmp -s $@.tmp $@ || mv $@.tmp $@
        @rm -f $@.tmp
 
-include/asterisk/build.h:
-       @build_tools/make_build_h > $@.tmp
-       @cmp -s $@.tmp $@ || mv $@.tmp $@
-       @rm -f $@.tmp
+# build.h must depend on .lastclean, or parallel make may wipe it out after it's
+# been created.
+include/asterisk/build.h: .lastclean
+       @build_tools/make_build_h > $@
 
 $(SUBDIRS_CLEAN):
        +@$(SUBMAKE) -C $(@:-clean=) clean
@@ -463,7 +414,10 @@ _clean:
        rm -f defaults.h
        rm -f include/asterisk/build.h
        rm -f main/version.c
-       rm -f include/asterisk/version.h
+       rm -f doc/core-en_US.xml
+       rm -f doc/full-en_US.xml
+       rm -f doc/rest-api/*.wiki
+       rm -f rest-api-templates/*.pyc
        @$(MAKE) -C menuselect clean
        cp -f .cleancount .lastclean
 
@@ -481,54 +435,93 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
        rm -rf doc/api
        rm -f build_tools/menuselect-deps
 
-datafiles: _all
-       if [ `$(ID) -u` = 0 ]; then \
-               CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" 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 ; \
+datafiles: _all doc/core-en_US.xml
+       CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig "$(DESTDIR)$(libdir)/pkgconfig";
+
+#      # Recursively install contents of the static-http directory, in case
+#      # extra content is provided there. See contrib/scripts/get_swagger_ui.sh
+       find static-http | while read x; do \
+               if test -d $$x; then \
+                       $(INSTALL) -m 755 -d "$(DESTDIR)$(ASTDATADIR)/$$x"; \
+               else \
+                       $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/$$x" ; \
+               fi \
        done
+       $(INSTALL) -m 644 doc/core-en_US.xml "$(DESTDIR)$(ASTDATADIR)/static-http";
+       $(INSTALL) -m 644 doc/appdocsxml.xslt "$(DESTDIR)$(ASTDATADIR)/static-http";
        if [ -d doc/tex/asterisk ] ; then \
-                       mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
-                       for n in doc/tex/asterisk/* ; do \
-                               $(INSTALL) -m 644 $$n $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
-                       done \
+               $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
+               for n in doc/tex/asterisk/* ; do \
+                       $(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
+               done \
        fi
-       mkdir -p $(DESTDIR)$(ASTDATADIR)/images
        for x in images/*.jpg; do \
-               $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
+               $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \
        done
-       mkdir -p $(DESTDIR)$(AGI_DIR)
        $(MAKE) -C sounds install
+       find rest-api -name "*.json" | while read x; do \
+               $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/rest-api" ; \
+       done
 
-doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
+ifneq ($(GREP),)
+  XML_core_en_US = $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
+endif
+
+doc/core-en_US.xml: makeopts .lastclean $(XML_core_en_US)
        @printf "Building Documentation For: "
        @echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@
        @echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@
+       @echo "<?xml-stylesheet type=\"text/xsl\" href=\"appdocsxml.xslt\"?>" > $@
        @echo "<docs xmlns:xi=\"http://www.w3.org/2001/XInclude\">" >> $@
        @for x in $(MOD_SUBDIRS); do \
                printf "$$x " ; \
-               for i in $$x/*.c; do \
+               for i in `find $$x -name '*.c'`; do \
                        $(AWK) -f build_tools/get_documentation $$i >> $@ ; \
                done ; \
        done
        @echo
        @echo "</docs>" >> $@
 
+ifneq ($(GREP),)
+  XML_full_en_US = $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
+endif
+
+doc/full-en_US.xml: makeopts .lastclean $(XML_full_en_US)
+ifeq ($(PYTHON),:)
+       @echo "--------------------------------------------------------------------------"
+       @echo "---        Please install python to build full documentation           ---"
+       @echo "--------------------------------------------------------------------------"
+else
+       @printf "Building Documentation For: "
+       @echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@
+       @echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@
+       @echo "<?xml-stylesheet type=\"text/xsl\" href=\"appdocsxml.xslt\"?>" > $@
+       @echo "<docs xmlns:xi=\"http://www.w3.org/2001/XInclude\">" >> $@
+       @for x in $(MOD_SUBDIRS); do \
+               printf "$$x " ; \
+               for i in `find $$x -name '*.c'`; do \
+                       $(PYTHON) build_tools/get_documentation.py < $$i >> $@ ; \
+               done ; \
+       done
+       @echo
+       @echo "</docs>" >> $@
+       @$(PYTHON) build_tools/post_process_documentation.py -i $@ -o "doc/core-en_US.xml"
+endif
+
 validate-docs: doc/core-en_US.xml
-ifeq ($(XMLSTARLET),:)
-       @echo "---------------------------------------------------------------"
-       @echo "--- Please install xmlstarlet to validate the documentation ---"
-       @echo "---------------------------------------------------------------"
+ifeq ($(XMLSTARLET)$(XMLLINT),::)
+       @echo "--------------------------------------------------------------------------"
+       @echo "--- Please install xmllint or xmlstarlet to validate the documentation ---"
+       @echo "--------------------------------------------------------------------------"
 else
+  ifneq ($(XMLLINT),:)
+       $(XMLLINT) --dtdvalid doc/appdocsxml.dtd --noout $<
+  else
        $(XMLSTARLET) val -d doc/appdocsxml.dtd $<
+  endif
 endif
 
-update: 
+update:
        @if [ -d .svn ]; then \
                echo "Updating from Subversion..." ; \
                fromrev="`svn info | $(AWK) '/Revision: / {print $$2}'`"; \
@@ -546,72 +539,68 @@ update:
        fi
 
 NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
-OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
+OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
+INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" "$(ASTVARRUNDIR)" \
+       "$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
+       "$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
+       "$(ASTSPOOLDIR)/voicemail" "$(ASTSPOOLDIR)/recording" \
+       "$(ASTHEADERDIR)" "$(ASTHEADERDIR)/doxygen" \
+       "$(ASTLOGDIR)" "$(ASTLOGDIR)/cdr-csv" "$(ASTLOGDIR)/cdr-custom" \
+       "$(ASTLOGDIR)/cel-custom" "$(ASTDATADIR)" "$(ASTDATADIR)/documentation" \
+       "$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \
+       "$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
+       "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \
+       "$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)"
 
 installdirs:
-       mkdir -p $(DESTDIR)$(MODULES_DIR)
-       mkdir -p $(DESTDIR)$(ASTSBINDIR)
-       mkdir -p $(DESTDIR)$(ASTETCDIR)
-       mkdir -p $(DESTDIR)$(ASTBINDIR)
-       mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
-       mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
-       mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
-       mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
-       mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
-       mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
-       mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
-
-bininstall: _all installdirs $(SUBDIRS_INSTALL)
-       $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
-       $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
-       $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
-       $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
-       if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
-               cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
-               chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
+       @for i in $(INSTALLDIRS); do \
+               if [ ! -z "$${i}" -a ! -d "$(DESTDIR)$${i}" ]; then \
+                       $(INSTALL) -d "$(DESTDIR)$${i}"; \
+               fi; \
+       done
+
+main-bininstall:
+       +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTLIBDIR="$(ASTLIBDIR)" $(SUBMAKE) -C main bininstall
+
+bininstall: _all installdirs $(SUBDIRS_INSTALL) main-bininstall
+       $(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
+       $(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/"
+       if [ ! -f "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk" -a ! -f /sbin/launchd ]; then \
+               cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;s|__ASTERISK_LOG_DIR__|$(ASTLOGDIR)|;' > contrib/scripts/safe.tmp ; \
+               $(INSTALL) -m 755 contrib/scripts/safe.tmp "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk" ; \
+               rm -f contrib/scripts/safe.tmp ; \
        fi
-       $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
-       $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)/doxygen
-       $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
-       $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
-       $(INSTALL) -m 644 include/asterisk/doxygen/*.h $(DESTDIR)$(ASTHEADERDIR)/doxygen
+       $(INSTALL) -m 644 include/asterisk.h "$(DESTDIR)$(includedir)"
+       $(INSTALL) -m 644 include/asterisk/*.h "$(DESTDIR)$(ASTHEADERDIR)"
+       $(INSTALL) -m 644 include/asterisk/doxygen/*.h "$(DESTDIR)$(ASTHEADERDIR)/doxygen"
        if [ -n "$(OLDHEADERS)" ]; then \
-               rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
+               for h in $(OLDHEADERS); do rm -f "$(DESTDIR)$(ASTHEADERDIR)/$$h"; done \
        fi
-       mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation
-       mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
-       mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-       mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
-       mkdir -p $(DESTDIR)$(ASTLOGDIR)/cel-csv
-       mkdir -p $(DESTDIR)$(ASTLOGDIR)/cel-custom
-       mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
-       mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
-       mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
-       mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
-       $(INSTALL) -m 644 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
-       $(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
-       $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
-       $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
-       $(INSTALL) -m 644 doc/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
+
+       $(INSTALL) -m 644 doc/core-*.xml "$(DESTDIR)$(ASTDATADIR)/documentation"
+       $(INSTALL) -m 644 doc/appdocsxml.xslt "$(DESTDIR)$(ASTDATADIR)/documentation"
+       $(INSTALL) -m 644 doc/appdocsxml.dtd "$(DESTDIR)$(ASTDATADIR)/documentation"
+       $(INSTALL) -m 644 doc/asterisk.8 "$(DESTDIR)$(ASTMANDIR)/man8"
+       $(INSTALL) -m 644 doc/astdb*.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 [ -f contrib/firmware/iax/iaxy.bin ] ; then \
-               $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
+               $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \
        fi
 
 $(SUBDIRS_INSTALL):
        +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
 
 NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
-OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
+OLDMODS=$(filter-out $(NEWMODS) $(notdir $(DESTDIR)$(ASTMODDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTMODDIR)/*.so)))
 
 oldmodcheck:
        @if [ -n "$(OLDMODS)" ]; then \
                echo " WARNING WARNING WARNING" ;\
                echo "" ;\
                echo " Your Asterisk modules directory, located at" ;\
-               echo " $(DESTDIR)$(MODULES_DIR)" ;\
+               echo " $(DESTDIR)$(ASTMODDIR)" ;\
                echo " contains modules that were not installed by this " ;\
                echo " version of Asterisk. Please ensure that these" ;\
                echo " modules are compatible with this version before" ;\
@@ -631,18 +620,18 @@ ifneq ($(findstring ~,$(DESTDIR)),)
        @exit 1
 endif
 
-install: badshell datafiles bininstall
+install: badshell bininstall datafiles
        @if [ -x /usr/sbin/asterisk-post-install ]; then \
-               /usr/sbin/asterisk-post-install $(DESTDIR) . ; \
+               /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
        fi
-       @echo " +---- Asterisk Installation Complete -------+"  
+       @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 " + 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 " + existing config files), run:              +"
        @echo " +                                           +"
        @echo " +               $(mK) samples               +"
        @echo " +                                           +"
@@ -665,134 +654,83 @@ upgrade: bininstall
 # XXX why *.adsi is installed first ?
 adsi:
        @echo Installing adsi config files...
-       @mkdir -p $(DESTDIR)$(ASTETCDIR)
+       $(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)"
        @for x in configs/*.adsi; do \
                dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
-               if [ -f $${dst} ] ; then \
+               if [ -f "$${dst}" ] ; then \
                        echo "Overwriting $$x" ; \
                else \
                        echo "Installing $$x" ; \
                fi ; \
-               $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
+               $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
        done
 
 samples: adsi
        @echo Installing other config files...
-       @mkdir -p $(DESTDIR)$(ASTETCDIR)
        @for x in configs/*.sample; do \
                dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ;        \
-               if [ -f $${dst} ]; then \
+               if [ -f "$${dst}" ]; then \
                        if [ "$(OVERWRITE)" = "y" ]; then \
-                               if cmp -s $${dst} $$x ; then \
+                               if cmp -s "$${dst}" "$$x" ; then \
                                        echo "Config file $$x is unchanged"; \
                                        continue; \
                                fi ; \
-                               mv -f $${dst} $${dst}.old ; \
+                               mv -f "$${dst}" "$${dst}.old" ; \
                        else \
                                echo "Skipping config file $$x"; \
                                continue; \
                        fi ;\
                fi ; \
                echo "Installing file $$x"; \
-               $(INSTALL) -m 644 $$x $${dst} ;\
+               $(INSTALL) -m 644 "$$x" "$${dst}" ;\
        done
-       @if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
-               echo "Creating asterisk.conf"; \
-               ( \
-               echo "[directories](!) ; remove the (!) to enable this" ; \
-               echo "astetcdir => $(ASTETCDIR)" ; \
-               echo "astmoddir => $(MODULES_DIR)" ; \
-               echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
-               echo "astdbdir => $(ASTDBDIR)" ; \
-               echo "astkeydir => $(ASTKEYDIR)" ; \
-               echo "astdatadir => $(ASTDATADIR)" ; \
-               echo "astagidir => $(AGI_DIR)" ; \
-               echo "astspooldir => $(ASTSPOOLDIR)" ; \
-               echo "astrundir => $(ASTVARRUNDIR)" ; \
-               echo "astlogdir => $(ASTLOGDIR)" ; \
-               echo "" ; \
-               echo "[options]" ; \
-               echo ";verbose = 3" ; \
-               echo ";debug = 3" ; \
-               echo ";alwaysfork = yes ; same as -F at startup" ; \
-               echo ";nofork = yes ; same as -f at startup" ; \
-               echo ";quiet = yes ; same as -q at startup" ; \
-               echo ";timestamp = yes ; same as -T at startup" ; \
-               echo ";execincludes = yes ; support #exec in config files" ; \
-               echo ";console = yes ; Run as console (same as -c at startup)" ; \
-               echo ";highpriority = yes ; Run realtime priority (same as -p at startup)" ; \
-               echo ";initcrypto = yes ; Initialize crypto keys (same as -i at startup)" ; \
-               echo ";nocolor = yes ; Disable console colors" ; \
-               echo ";dontwarn = yes ; Disable some warnings" ; \
-               echo ";dumpcore = yes ; Dump core on crash (same as -g at startup)" ; \
-               echo ";languageprefix = yes ; Use the new sound prefix path syntax" ; \
-               echo ";internal_timing = yes" ; \
-               echo ";systemname = my_system_name ; prefix uniqueid with a system name for global uniqueness issues" ; \
-               echo ";autosystemname = yes ; automatically set systemname to hostname - uses 'localhost' on failure, or systemname if set" ; \
-               echo ";maxcalls = 10 ; Maximum amount of calls allowed" ; \
-               echo ";maxload = 0.9 ; Asterisk stops accepting new calls if the load average exceed this limit" ; \
-               echo ";maxfiles = 1000 ; Maximum amount of openfiles" ; \
-               echo ";minmemfree = 1 ; in MBs, Asterisk stops accepting new calls if the amount of free memory falls below this watermark" ; \
-               echo ";cache_record_files = yes ; Cache recorded sound files to another directory during recording" ; \
-               echo ";record_cache_dir = /tmp ; Specify cache directory (used in conjunction with cache_record_files)" ; \
-               echo ";transmit_silence = yes ; Transmit silence while a channel is in a waiting state, a recording only state, or when DTMF is" ; \
-               echo "                        ; being generated.  Note that the silence internally is generated in raw signed linear format." ; \
-               echo "                        ; This means that it must be transcoded into the native format of the channel before it can be sent" ; \
-               echo "                        ; to the device.  It is for this reason that this is optional, as it may result in requiring a" ; \
-               echo "                        ; temporary codec translation path for a channel that may not otherwise require one." ; \
-               echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \
-               echo ";runuser = asterisk ; The user to run as" ; \
-               echo ";rungroup = asterisk ; The group to run as" ; \
-               echo ";lightbackground = yes ; If your terminal is set for a light-colored background" ; \
-               echo "documentation_language = en_US ; Set the Language you want Documentation displayed in. Value is in the same format as locale names" ; \
-               echo ";hideconnect = yes ; Hide messages displayed when a remote console connects and disconnects" ; \
-               echo ";lockconfdir = no ; Protect the directory containing the configuration files (/etc/asterisk) with a lock" ; \
-               echo "" ; \
-               echo "; Changing the following lines may compromise your security." ; \
-               echo ";[files]" ; \
-               echo ";astctlpermissions = 0660" ; \
-               echo ";astctlowner = root" ; \
-               echo ";astctlgroup = apache" ; \
-               echo ";astctl = asterisk.ctl" ; \
-               echo "" ; \
-               echo "[compat]" ; \
-               echo "pbx_realtime=1.6" ; \
-               echo "res_agi=1.6" ; \
-               echo "app_set=1.6" ; \
-               ) > $(DESTDIR)$(ASTCONFPATH) ; \
-       else \
-               echo "Skipping asterisk.conf creation"; \
-       fi
-       mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
-       build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
-       @mkdir -p $(DESTDIR)$(ASTDATADIR)/phoneprov
+       if [ "$(OVERWRITE)" = "y" ]; then \
+               echo "Updating asterisk.conf" ; \
+               sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
+                       -e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \
+                       -e 's|^astvarlibdir.*$$|astvarlibdir => $(ASTVARLIBDIR)|' \
+                       -e 's|^astdbdir.*$$|astdbdir => $(ASTDBDIR)|' \
+                       -e 's|^astkeydir.*$$|astkeydir => $(ASTKEYDIR)|' \
+                       -e 's|^astdatadir.*$$|astdatadir => $(ASTDATADIR)|' \
+                       -e 's|^astagidir.*$$|astagidir => $(AGI_DIR)|' \
+                       -e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \
+                       -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
+                       -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
+                       -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
+                       "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
+               $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \
+               rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
+       fi ; \
+       $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
+       build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)"
+
        @for x in phoneprov/*; do \
                dst="$(DESTDIR)$(ASTDATADIR)/$$x" ;     \
-               if [ -f $${dst} ]; then \
+               if [ -f "$${dst}" ]; then \
                        if [ "$(OVERWRITE)" = "y" ]; then \
-                               if cmp -s $${dst} $$x ; then \
+                               if cmp -s "$${dst}" "$$x" ; then \
                                        echo "Config file $$x is unchanged"; \
                                        continue; \
                                fi ; \
-                               mv -f $${dst} $${dst}.old ; \
+                               mv -f "$${dst}" "$${dst}.old" ; \
                        else \
                                echo "Skipping config file $$x"; \
                                continue; \
                        fi ;\
                fi ; \
                echo "Installing file $$x"; \
-               $(INSTALL) -m 644 $$x $${dst} ;\
+               $(INSTALL) -m 644 "$$x" "$${dst}" ;\
        done
 
 webvmail:
-       @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
-       @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
-       $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
-       mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
+       @[ -d "$(DESTDIR)$(HTTP_DOCSDIR)/" ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
+       @[ -d "$(DESTDIR)$(HTTP_CGIDIR)" ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
+       $(INSTALL) -m 4755 contrib/scripts/vmail.cgi "$(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi"
+       $(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk"
        for x in images/*.gif; do \
-               $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
+               $(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
        done
-       @echo " +--------- Asterisk Web Voicemail ----------+"  
+       @echo " +--------- Asterisk Web Voicemail ----------+"
        @echo " +                                           +"
        @echo " + Asterisk Web Voicemail is installed in    +"
        @echo " + your cgi-bin directory:                   +"
@@ -808,107 +746,164 @@ webvmail:
        @echo " + in your Makefile of HTTP_CGIDIR and       +"
        @echo " + HTTP_DOCSDIR                              +"
        @echo " +                                           +"
-       @echo " +-------------------------------------------+"  
+       @echo " +-------------------------------------------+"
 
 progdocs:
-       (cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \
-       echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen - 
+       # Note, Makefile conditionals must not be tabbed out. Wasted hours with that.
+ifeq ($(DOXYGEN),:)
+       @echo "Doxygen is not installed.  Please install and re-run the configuration script."
+else
+ifeq ($(DOT),:)
+       @echo "DOT is not installed. Doxygen will not produce any diagrams. Please install and re-run the configuration script."
+else
+       # Enable DOT
+       @echo "HAVE_DOT = YES" >> contrib/asterisk-ng-doxygen
+endif
+       # Set Doxygen PROJECT_NUMBER variable
+ifneq ($(ASTERISKVERSION),UNKNOWN__and_probably_unsupported)
+       @echo "PROJECT_NUMBER = $(ASTERISKVERSION)" >> contrib/asterisk-ng-doxygen
+else
+       echo "Asterisk Version is unknown, not configuring Doxygen PROJECT_NUMBER."
+endif
+       # Validate Doxygen Configuration
+       @doxygen -u contrib/asterisk-ng-doxygen
+       # Run Doxygen
+       @doxygen contrib/asterisk-ng-doxygen
+       # Remove configuration backup file
+       @rm -f contrib/asterisk-ng-doxygen.bak
+endif
 
 install-logrotate:
-       if [ ! -d $(ASTETCDIR)/../logrotate.d ]; then \
-               mkdir $(ASTETCDIR)/../logrotate.d ; \
+       if [ ! -d "$(DESTDIR)$(ASTETCDIR)/../logrotate.d" ]; then \
+               $(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)/../logrotate.d" ; \
        fi
        sed 's#__LOGDIR__#$(ASTLOGDIR)#g' < contrib/scripts/asterisk.logrotate | sed 's#__SBINDIR__#$(ASTSBINDIR)#g' > contrib/scripts/asterisk.logrotate.tmp
-       install -m 0644 contrib/scripts/asterisk.logrotate.tmp $(ASTETCDIR)/../logrotate.d/asterisk
+       $(INSTALL) -m 0644 contrib/scripts/asterisk.logrotate.tmp "$(DESTDIR)$(ASTETCDIR)/../logrotate.d/asterisk"
        rm -f contrib/scripts/asterisk.logrotate.tmp
 
 config:
        @if [ "${OSARCH}" = "linux-gnu" ]; then \
                if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \
-                       cat contrib/init.d/rc.redhat.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)/etc/rc.d/init.d/asterisk ;\
-                       chmod 755 $(DESTDIR)/etc/rc.d/init.d/asterisk;\
-                       if [ ! -f /etc/sysconfig/asterisk ]; then install -m 644 contrib/init.d/etc_default_asterisk /etc/sysconfig/asterisk ; fi ;\
-                       if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
-               elif [ -f /etc/debian_version ]; then \
-                       cat contrib/init.d/rc.debian.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)/etc/init.d/asterisk ;\
-                       chmod 755 $(DESTDIR)/etc/init.d/asterisk;\
-                       if [ ! -f /etc/default/asterisk ]; then install -m 644 contrib/init.d/etc_default_asterisk /etc/default/asterisk ; fi ;\
-                       if [ -z "$(DESTDIR)" ]; then /usr/sbin/update-rc.d asterisk defaults 50 91; fi; \
-               elif [ -f /etc/gentoo-release ]; then \
-                       cat contrib/init.d/rc.gentoo.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)/etc/init.d/asterisk ;\
-                       chmod 755 $(DESTDIR)/etc/init.d/asterisk;\
-                       if [ -z "$(DESTDIR)" ]; then /sbin/rc-update add asterisk default; fi; \
-               elif [ -f /etc/mandrake-release -o -f /etc/mandriva-release ]; then \
-                       cat contrib/init.d/rc.mandriva.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)/etc/rc.d/init.d/asterisk ;\
-                       chmod 755 $(DESTDIR)/etc/rc.d/init.d/asterisk;\
-                       if [ ! -f /etc/sysconfig/asterisk ]; then install -m 644 contrib/init.d/etc_default_asterisk /etc/sysconfig/asterisk ; fi ;\
-                       if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
-               elif [ -f /etc/SuSE-release -o -f /etc/novell-release ]; then \
-                       cat contrib/init.d/rc.suse.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)/etc/init.d/asterisk ;\
-                       chmod 755 $(DESTDIR)/etc/init.d/asterisk;\
-                       if [ ! -f /etc/sysconfig/asterisk ]; then install -m 644 contrib/init.d/etc_default_asterisk /etc/sysconfig/asterisk ; fi ;\
-                       if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
-               elif [ -f /etc/arch-release -o -f /etc/arch-release ]; then \
-                       cat contrib/init.d/rc.archlinux.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)/etc/rc.d/asterisk ;\
-                       chmod 755 $(DESTDIR)/etc/rc.d/asterisk;\
-               elif [ -d $(DESTDIR)/Library/LaunchDaemons -a ! -f $(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist ]; then \
-                       $(INSTALL) -m 644 contrib/init.d/org.asterisk.asterisk.plist $(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist; \
+                       cat contrib/init.d/rc.redhat.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
+                       $(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/rc.d/init.d/asterisk" ; \
+                       rm -f contrib/init.d/rc.asterisk.tmp ; \
+                       if [ ! -f "$(DESTDIR)/etc/sysconfig/asterisk" ] ; then \
+                               $(INSTALL) -m 644 contrib/init.d/etc_default_asterisk "$(DESTDIR)/etc/sysconfig/asterisk" ; \
+                       fi ; \
+                       if [ -z "$(DESTDIR)" ] ; then \
+                               /sbin/chkconfig --add asterisk ; \
+                       fi ; \
+               elif [ -f /etc/debian_version ] ; then \
+                       cat contrib/init.d/rc.debian.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
+                       $(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/init.d/asterisk" ; \
+                       rm -f contrib/init.d/rc.asterisk.tmp ; \
+                       if [ ! -f "$(DESTDIR)/etc/default/asterisk" ] ; then \
+                               $(INSTALL) -m 644 contrib/init.d/etc_default_asterisk "$(DESTDIR)/etc/default/asterisk" ; \
+                       fi ; \
+                       if [ -z "$(DESTDIR)" ] ; then \
+                               /usr/sbin/update-rc.d asterisk defaults 50 91 ; \
+                       fi ; \
+               elif [ -f /etc/gentoo-release ] ; then \
+                       cat contrib/init.d/rc.gentoo.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
+                       $(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/init.d/asterisk" ; \
+                       rm -f contrib/init.d/rc.asterisk.tmp ; \
+                       if [ -z "$(DESTDIR)" ] ; then \
+                               /sbin/rc-update add asterisk default ; \
+                       fi ; \
+               elif [ -f /etc/mandrake-release -o -f /etc/mandriva-release ] ; then \
+                       cat contrib/init.d/rc.mandriva.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
+                       $(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/rc.d/init.d/asterisk" ; \
+                       rm -f contrib/init.d/rc.asterisk.tmp ; \
+                       if [ ! -f /etc/sysconfig/asterisk ] ; then \
+                               $(INSTALL) -m 644 contrib/init.d/etc_default_asterisk "$(DESTDIR)/etc/sysconfig/asterisk" ; \
+                       fi ; \
+                       if [ -z "$(DESTDIR)" ] ; then \
+                               /sbin/chkconfig --add asterisk ; \
+                       fi ; \
+               elif [ -f /etc/SuSE-release -o -f /etc/novell-release ] ; then \
+                       cat contrib/init.d/rc.suse.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
+                       $(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/init.d/asterisk" ;\
+                       rm -f contrib/init.d/rc.asterisk.tmp ; \
+                       if [ ! -f /etc/sysconfig/asterisk ] ; then \
+                               $(INSTALL) -m 644 contrib/init.d/etc_default_asterisk "$(DESTDIR)/etc/sysconfig/asterisk" ; \
+                       fi ; \
+                       if [ -z "$(DESTDIR)" ] ; then \
+                               /sbin/chkconfig --add asterisk ; \
+                       fi ; \
+               elif [ -f /etc/arch-release -o -f /etc/arch-release ] ; then \
+                       cat contrib/init.d/rc.archlinux.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
+                       $(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/rc.d/asterisk" ; \
+                       rm -f contrib/init.d/rc.asterisk.tmp ; \
+               elif [ -d "$(DESTDIR)/Library/LaunchDaemons" ]; then \
+                       if [ ! -f "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist" ]; then \
+                               sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' < contrib/init.d/org.asterisk.asterisk.plist > asterisk.plist ; \
+                               $(INSTALL) -m 644 asterisk.plist "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist"; \
+                               rm -f asterisk.plist; \
+                       fi; \
+                       if [ ! -f "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.muted.plist" ]; then \
+                               sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' < contrib/init.d/org.asterisk.muted.plist > muted.plist ; \
+                               $(INSTALL) -m 644 muted.plist "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.muted.plist"; \
+                               rm -f muted.plist; \
+                       fi; \
                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."; \
+                       echo "We could not install init scripts for your distribution." ; \
                fi \
        else \
-               echo "We could not install init scripts for your operating system."; \
+               echo "We could not install init scripts for your operating system." ; \
        fi
 
 sounds:
        $(MAKE) -C sounds all
 
 # If the cleancount has been changed, force a make clean.
-# .cleancount is the global clean count, and .lastclean is the 
+# .cleancount is the global clean count, and .lastclean is the
 # last clean count we had
 
-cleantest:
-       @cmp -s .cleancount .lastclean || $(MAKE) clean
+.lastclean: .cleancount
+       @$(MAKE) clean
+       @[ -f "$(DESTDIR)$(ASTDBDIR)/astdb.sqlite3" ] || [ ! -f "$(DESTDIR)$(ASTDBDIR)/astdb" ] || [ ! -f menuselect.makeopts ] || grep -q MENUSELECT_UTILS=.*astdb2sqlite3 menuselect.makeopts || (sed -i.orig -e's/MENUSELECT_UTILS=\(.*\)/MENUSELECT_UTILS=\1 astdb2sqlite3/' menuselect.makeopts && echo "Updating menuselect.makeopts to include astdb2sqlite3" && echo "Original version backed up to menuselect.makeopts.orig")
 
 $(SUBDIRS_UNINSTALL):
        +@$(SUBMAKE) -C $(@:-uninstall=) uninstall
 
-_uninstall: $(SUBDIRS_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)/firmware
-       rm -f $(DESTDIR)$(ASTMANDIR)/man8/asterisk.8
-       rm -f $(DESTDIR)$(ASTMANDIR)/man8/astgenkey.8
-       rm -f $(DESTDIR)$(ASTMANDIR)/man8/autosupport.8
-       rm -f $(DESTDIR)$(ASTMANDIR)/man8/safe_asterisk.8
+main-binuninstall:
+       +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTLIBDIR="$(ASTLIBDIR)" $(SUBMAKE) -C main binuninstall
+
+_uninstall: $(SUBDIRS_UNINSTALL) main-binuninstall
+       rm -f "$(DESTDIR)$(ASTMODDIR)/"*
+       rm -f "$(DESTDIR)$(ASTSBINDIR)/astgenkey"
+       rm -f "$(DESTDIR)$(ASTSBINDIR)/autosupport"
+       rm -rf "$(DESTDIR)$(ASTHEADERDIR)"
+       rm -rf "$(DESTDIR)$(ASTDATADIR)/firmware"
+       rm -f "$(DESTDIR)$(ASTMANDIR)/man8/asterisk.8"
+       rm -f "$(DESTDIR)$(ASTMANDIR)/man8/astgenkey.8"
+       rm -f "$(DESTDIR)$(ASTMANDIR)/man8/autosupport.8"
+       rm -f "$(DESTDIR)$(ASTMANDIR)/man8/safe_asterisk.8"
        $(MAKE) -C sounds uninstall
 
 uninstall: _uninstall
-       @echo " +--------- Asterisk Uninstall Complete -----+"  
-       @echo " + Asterisk binaries, sounds, man pages,     +"  
-       @echo " + headers, modules, and firmware builds,    +"  
-       @echo " + have all been uninstalled.                +"  
+       @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 " +            $(mK) uninstall-all            +"  
-       @echo " +-------------------------------------------+"  
+       @echo " +            $(mK) uninstall-all            +"
+       @echo " +-------------------------------------------+"
 
 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)
+       rm -rf "$(DESTDIR)$(ASTMODDIR)"
+       rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
+       rm -rf "$(DESTDIR)$(ASTDATADIR)"
+       rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
+       rm -rf "$(DESTDIR)$(ASTETCDIR)"
+       rm -rf "$(DESTDIR)$(ASTLOGDIR)"
 
 menuconfig: menuselect
 
@@ -928,7 +923,7 @@ menuselect: menuselect/cmenuselect menuselect/nmenuselect menuselect/gmenuselect
        else \
                echo "No menuselect user interface found. Install ncurses,"; \
                echo "newt or GTK libraries to build one and re-rerun"; \
-               echo "'make menuselect'."; \
+               echo "'./configure' and 'make menuselect'."; \
        fi
 
 cmenuselect: menuselect/cmenuselect menuselect-tree menuselect.makeopts
@@ -941,24 +936,26 @@ nmenuselect: menuselect/nmenuselect menuselect-tree menuselect.makeopts
        -@menuselect/nmenuselect menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
 
 # options for make in menuselect/
-MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+MAKE_MENUSELECT=CC="$(BUILD_CC)" CXX="" LD="" AR="" RANLIB="" \
+               CFLAGS="$(BUILD_CFLAGS)" LDFLAGS="$(BUILD_LDFLAGS)" \
+               $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
 
-menuselect/menuselect: menuselect/makeopts
+menuselect/menuselect: menuselect/makeopts .lastclean
        +$(MAKE_MENUSELECT) menuselect
 
-menuselect/cmenuselect: menuselect/makeopts
+menuselect/cmenuselect: menuselect/makeopts .lastclean
        +$(MAKE_MENUSELECT) cmenuselect
 
-menuselect/gmenuselect: menuselect/makeopts
+menuselect/gmenuselect: menuselect/makeopts .lastclean
        +$(MAKE_MENUSELECT) gmenuselect
 
-menuselect/nmenuselect: menuselect/makeopts
+menuselect/nmenuselect: menuselect/makeopts .lastclean
        +$(MAKE_MENUSELECT) nmenuselect
 
-menuselect/makeopts: makeopts
+menuselect/makeopts: makeopts .lastclean
        +$(MAKE_MENUSELECT) makeopts
 
-menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml utils/utils.xml agi/agi.xml configure
+menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml utils/utils.xml agi/agi.xml configure makeopts
        @echo "Generating input for menuselect ..."
        @echo "<?xml version=\"1.0\"?>" > $@
        @echo >> $@
@@ -975,9 +972,18 @@ menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(di
        @cat sounds/sounds.xml >> $@
        @echo "</menu>" >> $@
 
-pdf: asterisk.pdf
-asterisk.pdf:
-       $(MAKE) -C doc/tex asterisk.pdf
+# We don't want to require Python or Pystache for every build, so this is its
+# own target.
+ari-stubs:
+ifeq ($(PYTHON),:)
+       @echo "--------------------------------------------------------------------------"
+       @echo "---        Please install python to build ARI stubs            ---"
+       @echo "--------------------------------------------------------------------------"
+       @false
+else
+       $(PYTHON) rest-api-templates/make_ari_stubs.py \
+               rest-api/resources.json .
+endif
 
 .PHONY: menuselect
 .PHONY: main
@@ -986,17 +992,19 @@ asterisk.pdf:
 .PHONY: dist-clean
 .PHONY: distclean
 .PHONY: all
+.PHONY: _all
+.PHONY: full
+.PHONY: _full
 .PHONY: prereqs
-.PHONY: cleantest
 .PHONY: uninstall
 .PHONY: _uninstall
 .PHONY: uninstall-all
-.PHONY: pdf
 .PHONY: dont-optimize
 .PHONY: badshell
 .PHONY: installdirs
 .PHONY: validate-docs
 .PHONY: _clean
+.PHONY: ari-stubs
 .PHONY: $(SUBDIRS_INSTALL)
 .PHONY: $(SUBDIRS_DIST_CLEAN)
 .PHONY: $(SUBDIRS_CLEAN)