[svn-commits] eliel: branch 1.6.1 r827 - in /branches/1.6.1: ./ build_tools/

[SVN commits to the Digium repositories]

Author: eliel
Date: Mon Mar 30 09:08:40 2009
New Revision: 827

URL: http://svn.digium.com/svn-view/asterisk-addons?view=rev&rev=827
Log:
Remove XML documentation install process from the Makefile.

XML documentation is not supported in -addons 1.6.1, so remove the modified
Makefile that tries to install a non-existent xml documentation.

(closes issue #14701)
Reported by: tzafrir


Removed:
    branches/1.6.1/build_tools/get_documentation
Modified:
    branches/1.6.1/Makefile
    branches/1.6.1/configure
    branches/1.6.1/configure.ac
    branches/1.6.1/makeopts.in

Modified: branches/1.6.1/Makefile
URL: http://svn.digium.com/svn-view/asterisk-addons/branches/1.6.1/Makefile?view=diff&rev=827&r1=826&r2=827
==============================================================================
--- branches/1.6.1/Makefile (original)
+++ branches/1.6.1/Makefile Mon Mar 30 09:08:40 2009
@@ -58,20 +58,10 @@
 ifeq ($(OSARCH),SunOS)
   ASTETCDIR=/var/etc/asterisk
   ASTLIBDIR=/opt/asterisk/lib
-  ASTVARLIBDIR=/var/opt/asterisk
 else
   ASTETCDIR=$(sysconfdir)/asterisk
   ASTLIBDIR=$(libdir)/asterisk
-ifneq ($(findstring BSD,$(OSARCH)),)
-  ASTVARLIBDIR=$(prefix)/share/asterisk
-else
-  ASTVARLIBDIR=$(localstatedir)/lib/asterisk
-endif
-endif
-ifeq ($(ASTDATADIR),)
-  ASTDATADIR:=$(ASTVARLIBDIR)
-endif
-
+endif
 MODULES_DIR=$(ASTLIBDIR)/modules
 
 #MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs tests main res $(LOCAL_MOD_SUBDIRS)
@@ -124,7 +114,7 @@
 	@echo " +               $(mK) install               +"  
 	@echo " +-------------------------------------------+"  
 
-_all: cleantest makeopts $(SUBDIRS) doc/addons-en_US.xml
+_all: cleantest makeopts $(SUBDIRS)
 
 makeopts: configure
 	@echo "****"
@@ -172,7 +162,7 @@
 	@echo "****"
 	@exit 1
 
-install: _all $(SUBDIRS_INSTALL) install-xmldoc 
+install: _all $(SUBDIRS_INSTALL)
 	@echo " +---- Asterisk-Addons Installation Complete ----+"
 	@echo " +                                               +"
 	@echo " +    Addons has successfully been installed.    +"
@@ -182,10 +172,6 @@
 	@echo " +                                               +"
 	@echo " +               $(MAKE) samples                    +"
 	@echo " +-----------------------------------------------+"
-
-install-xmldoc: doc/addons-en_US.xml
-	@echo "Installing XML documentation"
-	@$(INSTALL) -m 644 doc/addons-*.xml $(ASTDATADIR)/documentation
 
 cleantest:
 
@@ -232,29 +218,6 @@
 		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
 	done
 
-doc/addons-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc))
-	@echo -n "Building Documentation For: "
-	@echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@
-	@echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@
-	@echo "<docs>" >> $@
-	@for x in $(MOD_SUBDIRS); do \
-		echo -n "$$x " ; \
-		for i in $$x/*.c; do \
-			$(AWK) -f build_tools/get_documentation $$i >> $@ ; \
-		done ; \
-	done
-	@echo
-	@echo "</docs>" >> $@
-
-validate-docs: install-xmldoc 
-ifeq ($(XMLSTARLET),:)
-	@echo "---------------------------------------------------------------"
-	@echo "--- Please install xmlstarlet to validate the documentation ---"
-	@echo "---------------------------------------------------------------"
-else
-	@$(XMLSTARLET) val -E $(ASTDATADIR)/documentation/addons-en_US.xml 
-endif
-
 update:
 	@if [ -d .svn ]; then \
 		echo "Updating from Subversion..." ; \
@@ -329,4 +292,4 @@
 	@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
 	@echo "</menu>" >> $@
 
-.PHONY: menuselect clean dist-clean distclean all cleantest install-xmldoc uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
+.PHONY: menuselect clean dist-clean distclean all cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)

Modified: branches/1.6.1/configure.ac
URL: http://svn.digium.com/svn-view/asterisk-addons/branches/1.6.1/configure.ac?view=diff&rev=827&r1=826&r2=827
==============================================================================
--- branches/1.6.1/configure.ac (original)
+++ branches/1.6.1/configure.ac Mon Mar 30 09:08:40 2009
@@ -155,7 +155,6 @@
 AC_PATH_PROG([DIRNAME], [dirname], :)
 AC_PATH_PROG([SHELL], [sh], :)
 AC_PATH_PROG([LN], [ln], :)
-AC_PATH_PROG([XMLSTARLET], [xmlstarlet], :)
 
 AC_LANG(C)
 

Modified: branches/1.6.1/makeopts.in
URL: http://svn.digium.com/svn-view/asterisk-addons/branches/1.6.1/makeopts.in?view=diff&rev=827&r1=826&r2=827
==============================================================================
--- branches/1.6.1/makeopts.in (original)
+++ branches/1.6.1/makeopts.in Mon Mar 30 09:08:40 2009
@@ -50,5 +50,3 @@
 
 NCURSES_LIB=@NCURSES_LIB@
 NCURSES_INCLUDE=@NCURSES_INCLUDE@
-
-XMLSTARLET=@XMLSTARLET@