Merge "BuildSystem: Avoid $EUID and use id -u instead."
[asterisk/asterisk.git] / Makefile
index 2602d6d..6bc63a1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -99,12 +99,19 @@ export WGET_EXTRA_ARGS
 export LDCONFIG
 export LDCONFIG_FLAGS
 export PYTHON
-
--include makeopts
+export TAR
+export PATCH
+export SED
+export NM
+
+# makeopts is required unless the goal is clean or distclean
+ifeq ($(findstring clean,$(MAKECMDGOALS)),)
+include makeopts
+endif
 
 # start the primary CFLAGS and LDFLAGS with any that were provided
 # to the configure script
-_ASTCFLAGS:=$(CONFIG_CFLAGS)
+_ASTCFLAGS:=$(CONFIG_CFLAGS) $(CONFIG_SIGNED_CHAR)
 _ASTLDFLAGS:=$(CONFIG_LDFLAGS)
 
 # Some build systems, such as the one in openwrt, like to pass custom target
@@ -117,6 +124,9 @@ _ASTLDFLAGS+=$(LDOPTS)
 # libxml2 cflags
 _ASTCFLAGS+=$(LIBXML2_INCLUDE)
 
+# BIND_8_COMPAT
+_ASTCFLAGS+=$(BIND8_CFLAGS)
+
 #Uncomment this to see all build commands instead of 'quiet' output
 #NOISY_BUILD=yes
 
@@ -124,7 +134,7 @@ empty:=
 space:=$(empty) $(empty)
 ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
 
-# Overwite config files on "make samples"
+# Overwite config files on "make samples" or other config installation targets
 OVERWRITE=y
 
 # Include debug and macro symbols in the executables (-g) and profiling info (-pg)
@@ -160,8 +170,14 @@ DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d
 # 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)
+ifeq ($(wildcard menuselect.makeopts),)
+       USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
+       GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
+else
+       USER_MAKEOPTS=
+       GLOBAL_MAKEOPTS=
+endif
+
 
 MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
 OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
@@ -169,11 +185,6 @@ OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
 # Create OPTIONS variable, but probably we can assign directly to ASTCFLAGS
 OPTIONS=
 
-ifeq ($(OSARCH),linux-gnu)
-  # flag to tell 'ldconfig' to only process specified directories
-  LDCONFIG_FLAGS=-n
-endif
-
 ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),)
   ifeq ($(findstring -pipe,$(_ASTCFLAGS) $(ASTCFLAGS)),)
     _ASTCFLAGS+=-pipe
@@ -184,7 +195,7 @@ ifeq ($(findstring -Wall,$(_ASTCFLAGS) $(ASTCFLAGS)),)
   _ASTCFLAGS+=-Wall
 endif
 
-_ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_NESTED_FUNCTIONS) $(DEBUG)
+_ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_NESTED_FUNCTIONS) $(AST_CLANG_BLOCKS) $(DEBUG)
 ADDL_TARGETS=
 
 ifeq ($(AST_DEVMODE),yes)
@@ -198,7 +209,9 @@ ifeq ($(AST_DEVMODE),yes)
   ifeq ($(AST_DEVMODE_STRICT),yes)
     _ASTCFLAGS+=-Wshadow
   endif
-  ADDL_TARGETS+=validate-docs
+  ifneq ($(DISABLE_XMLDOC),yes)
+    ADDL_TARGETS+=validate-docs
+  endif
 endif
 
 ifneq ($(findstring BSD,$(OSARCH)),)
@@ -209,8 +222,6 @@ 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)
@@ -238,26 +249,31 @@ ifneq ($(wildcard .svn),)
   ASTERISKVERSIONNUM:=999999
 endif
 
+ifneq ($(DISABLE_XMLDOC),yes)
+  CORE_XMLDOC=doc/core-en_US.xml
+  FULL_XMLDOC=doc/full-en_US.xml
+else
+  CORE_XMLDOC=
+  FULL_XMLDOC=
+endif
+
 _ASTCFLAGS+=$(OPTIONS)
 
-MOD_SUBDIRS:=channels pbx apps codecs formats cdr cel bridges funcs tests main res addons $(LOCAL_MOD_SUBDIRS)
-OTHER_SUBDIRS:=utils agi
+MOD_SUBDIRS:=third-party channels pbx apps codecs formats cdr cel bridges funcs tests main res addons $(LOCAL_MOD_SUBDIRS)
+OTHER_SUBDIRS:=utils agi contrib
 SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
 SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
 SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
 SUBDIRS_DIST_CLEAN:=$(SUBDIRS:%=%-dist-clean)
 SUBDIRS_UNINSTALL:=$(SUBDIRS:%=%-uninstall)
-MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript)
-MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
-MOD_SUBDIRS_EMBED_LIBS:=$(MOD_SUBDIRS:%=%-embed-libs)
 MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree)
 
 ifneq ($(findstring darwin,$(OSARCH)),)
   _ASTCFLAGS+=-D__Darwin__ -mmacosx-version-min=10.6
-  _SOLINK=-mmacosx-version-min=10.6 -Xlinker -undefined -Xlinker dynamic_lookup
+  _SOLINK=-mmacosx-version-min=10.6 -Wl,-undefined,dynamic_lookup
   _SOLINK+=/usr/lib/bundle1.o
   SOLINK=-bundle $(_SOLINK)
-  DYLINK=-Xlinker -dylib $(_SOLINK)
+  DYLINK=-Wl,-dylib $(_SOLINK)
   _ASTLDFLAGS+=-L/usr/local/lib
 else
 # These are used for all but Darwin
@@ -321,9 +337,9 @@ full: _full
        @echo " +-------------------------------------------+"
 
 
-_all: makeopts $(SUBDIRS) doc/core-en_US.xml $(ADDL_TARGETS)
+_all: makeopts $(SUBDIRS) $(CORE_XMLDOC) $(ADDL_TARGETS)
 
-_full: makeopts $(SUBDIRS) doc/full-en_US.xml $(ADDL_TARGETS)
+_full: makeopts $(SUBDIRS) $(FULL_XMLDOC) $(ADDL_TARGETS)
 
 makeopts: configure
        @echo "****"
@@ -333,44 +349,19 @@ makeopts: configure
        @exit 1
 
 menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
-ifeq ($(filter %menuselect,$(MAKECMDGOALS)),)
+ifeq ($(filter %.menuselect,$(MAKECMDGOALS)),)
        menuselect/menuselect --check-deps $@
        menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
 endif
 
-$(MOD_SUBDIRS_EMBED_LDSCRIPT):
-       +@echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
-
-$(MOD_SUBDIRS_EMBED_LDFLAGS):
-       +@echo "EMBED_LDFLAGS+="`$(SILENTMAKE) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
-
-$(MOD_SUBDIRS_EMBED_LIBS):
-       +@echo "EMBED_LIBS+="`$(SILENTMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
-
 $(MOD_SUBDIRS_MENUSELECT_TREE):
        +@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
        +@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
 
-makeopts.embed_rules: menuselect.makeopts
-       @echo "Generating embedded module rules ..."
-       @rm -f $@
-       +@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDSCRIPT)
-       +@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS)
-       +@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LIBS)
-
-$(SUBDIRS): makeopts .lastclean main/version.c 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
 
 ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
-  ifeq ($(shell grep ^MENUSELECT_EMBED=$$ menuselect.makeopts 2>/dev/null),)
-    # Non-windows:
-    # ensure that all module subdirectories are processed before 'main' during
-    # a parallel build, since if there are modules selected to be embedded the
-    # directories containing them must be completed before the main Asterisk
-    # binary can be built.
-    # If MENUSELECT_EMBED is empty, we don't need this and allow 'main' to be
-    # be built without building all dependencies first.
-main: $(filter-out main,$(MOD_SUBDIRS))
-  endif
+main: third-party
 else
     # Windows: we need to build main (i.e. the asterisk dll) first,
     # followed by res, followed by the other directories, because
@@ -393,7 +384,7 @@ defaults.h: makeopts .lastclean build_tools/make_defaults_h
        @cmp -s $@.tmp $@ || mv $@.tmp $@
        @rm -f $@.tmp
 
-main/version.c: FORCE .lastclean
+main/version.c: FORCE menuselect.makeopts .lastclean
        @build_tools/make_version_c > $@.tmp
        @cmp -s $@.tmp $@ || mv $@.tmp $@
        @rm -f $@.tmp
@@ -423,6 +414,8 @@ _clean:
        rm -f doc/core-en_US.xml
        rm -f doc/full-en_US.xml
        rm -f doc/rest-api/*.wiki
+       rm -f doxygen.log
+       rm -rf latex
        rm -f rest-api-templates/*.pyc
        @$(MAKE) -C menuselect clean
        cp -f .cleancount .lastclean
@@ -433,15 +426,15 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
        @$(MAKE) -C menuselect dist-clean
        @$(MAKE) -C sounds dist-clean
        rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
-       rm -f makeopts.embed_rules
        rm -f config.log config.status config.cache
        rm -rf autom4te.cache
        rm -f include/asterisk/autoconfig.h
        rm -f include/asterisk/buildopts.h
        rm -rf doc/api
+       rm -f doc/asterisk-ng-doxygen
        rm -f build_tools/menuselect-deps
 
-datafiles: _all doc/core-en_US.xml
+datafiles: _all $(CORE_XMLDOC)
        CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig "$(DESTDIR)$(libdir)/pkgconfig";
 
 #      # Recursively install contents of the static-http directory, in case
@@ -453,8 +446,10 @@ datafiles: _all doc/core-en_US.xml
                        $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/$$x" ; \
                fi \
        done
+ifneq ($(DISABLE_XMLDOC),yes)
        $(INSTALL) -m 644 doc/core-en_US.xml "$(DESTDIR)$(ASTDATADIR)/static-http";
        $(INSTALL) -m 644 doc/appdocsxml.xslt "$(DESTDIR)$(ASTDATADIR)/static-http";
+endif
        if [ -d doc/tex/asterisk ] ; then \
                $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
                for n in doc/tex/asterisk/* ; do \
@@ -477,7 +472,7 @@ 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 "<?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 " ; \
@@ -501,7 +496,7 @@ 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 "<?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 " ; \
@@ -556,7 +551,8 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" "$(ASTV
        "$(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)"
+       "$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \
+       "$(ASTDATADIR)/third-party"
 
 installdirs:
        @for i in $(INSTALLDIRS); do \
@@ -569,6 +565,7 @@ main-bininstall:
        +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTLIBDIR="$(ASTLIBDIR)" $(SUBMAKE) -C main bininstall
 
 bininstall: _all installdirs $(SUBDIRS_INSTALL) main-bininstall
+       $(INSTALL) -m 755 contrib/scripts/astversion "$(DESTDIR)$(ASTSBINDIR)/"
        $(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
        $(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/"
        if [ ! -f /sbin/launchd ]; then \
@@ -581,9 +578,11 @@ bininstall: _all installdirs $(SUBDIRS_INSTALL) main-bininstall
                for h in $(OLDHEADERS); do rm -f "$(DESTDIR)$(ASTHEADERDIR)/$$h"; done \
        fi
 
+ifneq ($(DISABLE_XMLDOC),yes)
        $(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"
+endif
        $(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"
@@ -598,13 +597,14 @@ ifeq ($(HAVE_DAHDI),1)
 endif
 
 $(SUBDIRS_INSTALL):
-       +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
+       +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-install=) install
 
 NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
 OLDMODS=$(filter-out $(NEWMODS) $(notdir $(DESTDIR)$(ASTMODDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTMODDIR)/*.so)))
+BADMODS=$(strip $(filter-out $(shell ./build_tools/list_valid_installed_externals),$(OLDMODS)))
 
 oldmodcheck:
-       @if [ -n "$(OLDMODS)" ]; then \
+       @if [ -n "$(BADMODS)" ]; then \
                echo " WARNING WARNING WARNING" ;\
                echo "" ;\
                echo " Your Asterisk modules directory, located at" ;\
@@ -614,15 +614,89 @@ oldmodcheck:
                echo " modules are compatible with this version before" ;\
                echo " attempting to run Asterisk." ;\
                echo "" ;\
-               for f in $(OLDMODS); do \
+               for f in $(BADMODS); do \
                        echo "    $$f" ;\
                done ;\
                echo "" ;\
                echo " WARNING WARNING WARNING" ;\
        fi
 
+ld-cache-update:
+ifneq ($(LDCONFIG),)
+ifeq ($(DESTDIR),)  # DESTDIR means binary archive creation; ldconfig should be run on postinst
+       @if [ $$(id -u) -eq 0 ] ; then \
+               $(LDCONFIG) "$(ASTLIBDIR)/" ; \
+       else \
+               echo " WARNING WARNING WARNING" ;\
+               echo "" ;\
+               echo " You cannot rebuild the system linker cache unless you are root. " ;\
+               echo " You MUST do one of the following..." ;\
+               echo "  * Re-run 'make install' as root. " ;\
+               echo "  * Run 'ldconfig $(ASTLIBDIR)' as root. " ;\
+               echo "  * Run asterisk with 'LD_LIBRARY_PATH=$(ASTLIBDIR) asterisk' " ;\
+               echo "" ;\
+               echo " WARNING WARNING WARNING" ;\
+       fi
+endif
+endif
+
+export _oldlibdir =
+export _oldmoddir =
+ifeq ($(findstring 64,$(HOST_CPU)),64)
+    # Strip any trailing '/' so the dir and notdir functions work correctly
+    _current_libdir = $(patsubst %/,%,$(DESTDIR)$(ASTLIBDIR))
+
+    # Only process if the paths end in lib64 or lib.
+    # If we're installing to lib64, check lib for orphans.
+    # If we're installing to lib, check lib64 for orphans.
+    # Otherwise, leave _oldlibdir empty.
+    ifeq ($(notdir $(_current_libdir)),lib64)
+        _oldlibdir = $(dir $(_current_libdir))lib
+    else ifeq ($(notdir $(_current_libdir)),lib)
+        _oldlibdir = $(dir $(_current_libdir))lib64
+    endif
+
+    # Strip any trailing '/' so the dir and notdir functions work correctly
+    _current_moddir = $(patsubst %/,%,$(DESTDIR)$(ASTMODDIR))
+
+    # Only process if the paths contain /lib64/ or /lib/.
+    # If we're installing to lib64, check lib for orphans.
+    # If we're installing to lib, check lib64 for orphans.
+    # Otherwise, leave _oldmoddir empty.
+    ifeq ($(findstring /lib64/,$(_current_moddir)),/lib64/)
+        _oldmoddir = $(subst /lib64/,/lib/,$(_current_moddir))
+    else ifeq ($(findstring /lib/,$(_current_moddir)),/lib/)
+        _oldmoddir = $(subst /lib/,/lib64/,$(_current_moddir))
+    endif
+endif
+
+check-old-libdir:
+       @test -n "$(_oldlibdir)" -a -d "$(_oldlibdir)" || exit 0 ;\
+       oldfiles=`find "$(_oldlibdir)" -name libasterisk* -print -quit -o \( -path *asterisk/modules/* -a -name *.so \) -print -quit 2>/dev/null` ;\
+       if [ "x$$oldfiles" != "x" ] ; then \
+               echo " WARNING WARNING WARNING" ;\
+               echo "" ;\
+               echo " Installation is to: " ;\
+               echo "   $(DESTDIR)$(ASTLIBDIR)" ;\
+               echo " but there are asterisk shared libraries in: " ;\
+               echo "   $(_oldlibdir)" ;\
+               echo " or" ;\
+               echo "   $(_oldlibdir)/asterisk/modules" ;\
+               echo "" ;\
+               echo " It is unlikely that asterisk will start." ;\
+               echo "" ;\
+               echo " You should do one of the following..." ;\
+               echo "  * Run 'make uninstall' to remove the incorrect libraries" ;\
+               echo "    then run 'make install' again." ;\
+               echo "  * Manually remove the libraries from" ;\
+               echo "   $(_oldlibdir)" ;\
+               echo "   and run 'ldconfig' to rebuild the linker cache." ;\
+               echo "" ;\
+               echo " WARNING WARNING WARNING" ;\
+       fi
+
 badshell:
-ifneq ($(findstring ~,$(DESTDIR)),)
+ifneq ($(filter ~%,$(DESTDIR)),)
        @echo "Your shell doesn't do ~ expansion when expected (specifically, when doing \"make install DESTDIR=~/path\")."
        @echo "Try replacing ~ with \$$HOME, as in \"make install DESTDIR=\$$HOME/path\"."
        @exit 1
@@ -641,7 +715,12 @@ install: badshell bininstall datafiles
        @echo " + configuration files (overwriting any      +"
        @echo " + existing config files), run:              +"
        @echo " +                                           +"
-       @echo " +               $(mK) samples               +"
+       @echo " + For generic reference documentation:      +"
+       @echo " +   $(mK) samples                           +"
+       @echo " +                                           +"
+       @echo " + For a sample basic PBX:                   +"
+       @echo " +   $(mK) basic-pbx                         +"
+       @echo " +                                           +"
        @echo " +                                           +"
        @echo " +-----------------  or ---------------------+"
        @echo " +                                           +"
@@ -654,29 +733,21 @@ install: badshell bininstall datafiles
        @echo " + doxygen installed on your local system    +"
        @echo " +-------------------------------------------+"
        @$(MAKE) -s oldmodcheck
+       @$(MAKE) -s ld-cache-update
+       @$(MAKE) -s check-old-libdir
 
 isntall: install
 
 upgrade: bininstall
 
-# XXX why *.adsi is installed first ?
-adsi:
-       @echo Installing adsi config files...
-       $(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)"
-       @for x in configs/samples/*.adsi; do \
-               dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
-               if [ -f "$${dst}" ] ; then \
-                       echo "Overwriting $$x" ; \
-               else \
-                       echo "Installing $$x" ; \
-               fi ; \
-               $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
-       done
 
-samples: adsi
-       @echo Installing other config files...
-       @for x in configs/samples/*.sample; do \
-               dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ;        \
+# Install configuration files from the specified directory
+# Parameters:
+#  (1) the configuration directory to install from
+#  (2) the extension to strip off
+define INSTALL_CONFIGS
+       @for x in configs/$(1)/*$(2); do \
+               dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x $(2)`"; \
                if [ -f "$${dst}" ]; then \
                        if [ "$(OVERWRITE)" = "y" ]; then \
                                if cmp -s "$${dst}" "$$x" ; then \
@@ -691,7 +762,7 @@ samples: adsi
                fi ; \
                echo "Installing file $$x"; \
                $(INSTALL) -m 644 "$$x" "$${dst}" ;\
-       done
+       done ; \
        if [ "$(OVERWRITE)" = "y" ]; then \
                echo "Updating asterisk.conf" ; \
                sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
@@ -708,10 +779,28 @@ samples: adsi
                        "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
                $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \
                rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
-       fi ; \
+       fi
+endef
+
+# XXX why *.adsi is installed first ?
+adsi:
+       @echo Installing adsi config files...
+       $(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)"
+       @for x in configs/samples/*.adsi; do \
+               dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
+               if [ -f "$${dst}" ] ; then \
+                       echo "Overwriting $$x" ; \
+               else \
+                       echo "Installing $$x" ; \
+               fi ; \
+               $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
+       done
+
+samples: adsi
+       @echo Installing other config files...
+       $(call INSTALL_CONFIGS,samples,.sample)
        $(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 \
@@ -730,6 +819,10 @@ samples: adsi
                $(INSTALL) -m 644 "$$x" "$${dst}" ;\
        done
 
+basic-pbx:
+       @echo Installing basic-pbx config files...
+       $(call INSTALL_CONFIGS,basic-pbx)
+
 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 )
@@ -757,7 +850,8 @@ webvmail:
        @echo " +-------------------------------------------+"
 
 progdocs:
-       # Note, Makefile conditionals must not be tabbed out. Wasted hours with that.
+# Note, Makefile conditionals must not be tabbed out. Wasted hours with that.
+       @cp doc/asterisk-ng-doxygen.in doc/asterisk-ng-doxygen
 ifeq ($(DOXYGEN),:)
        @echo "Doxygen is not installed.  Please install and re-run the configuration script."
 else
@@ -765,20 +859,20 @@ 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
+       @echo "HAVE_DOT = YES" >> doc/asterisk-ng-doxygen
 endif
        # Set Doxygen PROJECT_NUMBER variable
 ifneq ($(ASTERISKVERSION),UNKNOWN__and_probably_unsupported)
-       @echo "PROJECT_NUMBER = $(ASTERISKVERSION)" >> contrib/asterisk-ng-doxygen
+       @echo "PROJECT_NUMBER = $(ASTERISKVERSION)" >> doc/asterisk-ng-doxygen
 else
        echo "Asterisk Version is unknown, not configuring Doxygen PROJECT_NUMBER."
 endif
-       # Validate Doxygen Configuration
-       @doxygen -u contrib/asterisk-ng-doxygen
+       # Validate and auto-update local copy
+       @doxygen -u doc/asterisk-ng-doxygen
        # Run Doxygen
-       @doxygen contrib/asterisk-ng-doxygen
+       @doxygen doc/asterisk-ng-doxygen
        # Remove configuration backup file
-       @rm -f contrib/asterisk-ng-doxygen.bak
+       @rm -f doc/asterisk-ng-doxygen.bak
 endif
 
 install-logrotate:
@@ -790,60 +884,56 @@ install-logrotate:
        rm -f contrib/scripts/asterisk.logrotate.tmp
 
 config:
-       @if [ "${OSARCH}" = "linux-gnu" ]; then \
-               if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \
-                       ./build_tools/install_subst contrib/init.d/rc.redhat.asterisk  "$(DESTDIR)/etc/rc.d/init.d/asterisk"; \
-                       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 \
-                       ./build_tools/install_subst contrib/init.d/rc.debian.asterisk  "$(DESTDIR)/etc/init.d/asterisk"; \
-                       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 \
-                       ./build_tools/install_subst contrib/init.d/rc.gentoo.asterisk  "$(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 \
-                       ./build_tools/install_subst contrib/init.d/rc.mandriva.asterisk  "$(DESTDIR)/etc/rc.d/init.d/asterisk"; \
-                       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 \
-                       ./build_tools/install_subst contrib/init.d/rc.suse.asterisk  "$(DESTDIR)/etc/init.d/asterisk"; \
-                       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 \
-                       ./build_tools/install_subst contrib/init.d/rc.archlinux.asterisk  "$(DESTDIR)/etc/init.d/asterisk"; \
-               elif [ -d "$(DESTDIR)/Library/LaunchDaemons" ]; then \
-                       if [ ! -f "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist" ]; then \
-                               ./build_tools/install_subst contrib/init.d/org.asterisk.asterisk.plist "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist"; \
-                       fi; \
-                       if [ ! -f "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.muted.plist" ]; then \
-                               ./build_tools/install_subst contrib/init.d/org.asterisk.muted.plist "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.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." ; \
-               fi \
+       @if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \
+               ./build_tools/install_subst contrib/init.d/rc.redhat.asterisk  "$(DESTDIR)/etc/rc.d/init.d/asterisk"; \
+               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 \
+               ./build_tools/install_subst contrib/init.d/rc.debian.asterisk  "$(DESTDIR)/etc/init.d/asterisk"; \
+               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 \
+               ./build_tools/install_subst contrib/init.d/rc.gentoo.asterisk  "$(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 \
+               ./build_tools/install_subst contrib/init.d/rc.mandriva.asterisk  "$(DESTDIR)/etc/rc.d/init.d/asterisk"; \
+               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 \
+               ./build_tools/install_subst contrib/init.d/rc.suse.asterisk  "$(DESTDIR)/etc/init.d/asterisk"; \
+               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 \
+               ./build_tools/install_subst contrib/init.d/rc.archlinux.asterisk  "$(DESTDIR)/etc/init.d/asterisk"; \
+       elif [ -d "$(DESTDIR)/Library/LaunchDaemons" ]; then \
+               if [ ! -f "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist" ]; then \
+                       ./build_tools/install_subst contrib/init.d/org.asterisk.asterisk.plist "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist"; \
+               fi; \
+               if [ ! -f "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.muted.plist" ]; then \
+                       ./build_tools/install_subst contrib/init.d/org.asterisk.muted.plist "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.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 operating system." ; \
+               echo "We could not install init scripts for your distribution." ; \
        fi
 
 sounds:
@@ -858,13 +948,14 @@ sounds:
        @[ -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
+       +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-uninstall=) uninstall
 
 main-binuninstall:
        +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTLIBDIR="$(ASTLIBDIR)" $(SUBMAKE) -C main binuninstall
 
 _uninstall: $(SUBDIRS_UNINSTALL) main-binuninstall
        rm -f "$(DESTDIR)$(ASTMODDIR)/"*
+       test -n "$(_oldmoddir)" -a -d "$(_oldmoddir)" && rm -f "$(_oldmoddir)/"* || :
        rm -f "$(DESTDIR)$(ASTSBINDIR)/astgenkey"
        rm -f "$(DESTDIR)$(ASTSBINDIR)/autosupport"
        rm -rf "$(DESTDIR)$(ASTHEADERDIR)"
@@ -877,6 +968,9 @@ ifeq ($(HAVE_DAHDI),1)
        rm -f $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk
 endif
        $(MAKE) -C sounds uninstall
+ifneq ($(LDCONFIG),)
+       $(LDCONFIG) || :
+endif
 
 uninstall: _uninstall
        @echo " +--------- Asterisk Uninstall Complete -----+"
@@ -894,6 +988,7 @@ uninstall: _uninstall
 
 uninstall-all: _uninstall
        rm -rf "$(DESTDIR)$(ASTMODDIR)"
+       test -n "$(_oldmoddir)" -a -d "$(_oldmoddir)" && rm -rf "$(_oldmoddir)" || :
        rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
        rm -rf "$(DESTDIR)$(ASTDATADIR)"
        rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
@@ -931,7 +1026,7 @@ 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="$(BUILD_CC)" CXX="" LD="" AR="" RANLIB="" \
+MAKE_MENUSELECT=CC="$(BUILD_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" \
                CFLAGS="$(BUILD_CFLAGS)" LDFLAGS="$(BUILD_LDFLAGS)" \
                $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
 
@@ -950,7 +1045,7 @@ menuselect/nmenuselect: menuselect/makeopts .lastclean
 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 makeopts
+menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc) $(wildcard $(dir)/*.xml)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml utils/utils.xml agi/agi.xml configure makeopts
        @echo "Generating input for menuselect ..."
        @echo "<?xml version=\"1.0\"?>" > $@
        @echo >> $@
@@ -963,7 +1058,6 @@ menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(di
        fi
        @cat utils/utils.xml >> $@
        @cat agi/agi.xml >> $@
-       @cat build_tools/embed_modules.xml >> $@
        @cat sounds/sounds.xml >> $@
        @echo "</menu>" >> $@
 
@@ -976,10 +1070,15 @@ ifeq ($(PYTHON),:)
        @echo "--------------------------------------------------------------------------"
        @false
 else
+       @$(INSTALL) -d doc/rest-api
        $(PYTHON) rest-api-templates/make_ari_stubs.py \
                rest-api/resources.json .
 endif
 
+check-alembic: makeopts
+       @find contrib/ast-db-manage/ -name '*.pyc' -delete
+       @ALEMBIC=$(ALEMBIC) build_tools/make_check_alembic config cdr voicemail >&2
+
 .PHONY: menuselect
 .PHONY: main
 .PHONY: sounds
@@ -1000,14 +1099,17 @@ endif
 .PHONY: validate-docs
 .PHONY: _clean
 .PHONY: ari-stubs
+.PHONY: basic-pbx
+.PHONY: check-alembic
+.PHONY: ld-cache-update
+.PHONY: check-old-libdir
 .PHONY: $(SUBDIRS_INSTALL)
 .PHONY: $(SUBDIRS_DIST_CLEAN)
 .PHONY: $(SUBDIRS_CLEAN)
 .PHONY: $(SUBDIRS_UNINSTALL)
 .PHONY: $(SUBDIRS)
-.PHONY: $(MOD_SUBDIRS_EMBED_LDSCRIPT)
-.PHONY: $(MOD_SUBDIRS_EMBED_LDFLAGS)
-.PHONY: $(MOD_SUBDIRS_EMBED_LIBS)
 
 FORCE:
 
+# This only stops targets within the root Makefile from building in parallel.
+.NOTPARALLEL: