[GRASS-SVN] r43124 - grass/branches/develbranch_6

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-08-15 22:18:50 +0000 (Sun, 15 Aug 2010)
New Revision: 43124

Removed:
   grass/branches/develbranch_6/swig/
Modified:
   grass/branches/develbranch_6/Makefile
   grass/branches/develbranch_6/configure
   grass/branches/develbranch_6/configure.in
Log:
swig removed
(merge r43095, r43096 & r43097 from relbr64)


Modified: grass/branches/develbranch_6/Makefile
===================================================================
--- grass/branches/develbranch_6/Makefile	2010-08-15 20:36:09 UTC (rev 43123)
+++ grass/branches/develbranch_6/Makefile	2010-08-15 22:18:50 UTC (rev 43124)
@@ -53,7 +53,6 @@
 	vector \
 	visualization \
 	man
-#	swig
 
 ifneq ($(strip $(MACOSX_APP)),)
 	DIRS += macosx
@@ -201,7 +200,6 @@
 	-rm -f config.cache config.log config.status config.status.${ARCH} 2>/dev/null
 	-rm -f ChangeLog ChangeLog.bak $(ERRORLOG) grass.pc
 	-rm -f include/config.h include/version.h include/winname.h include/Make/Grass.make include/Make/Platform.make 2>/dev/null
-	-rm -f swig/perl/Makefile.PL swig/perl2/make.pl 2>/dev/null
 
 strip: FORCE
 	@ if [ ! -f ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR} ] ; then \
@@ -381,7 +379,6 @@
 	(cd lib/ ; $(MAKE) cleandocs ; $(MAKE) htmldocs-single)
 	(cd rfc/ ; $(MAKE) cleandocs ; $(MAKE) htmldocs-single)
 	(cd gui/wxpython/ ; $(MAKE) cleandocs ; $(MAKE) htmldocs-single)
-	(cd swig/; $(MAKE) cleandocs ; $(MAKE) htmldocs-single)
 
 # generate docs as multiple HTML documents:
 htmldocs:
@@ -398,10 +395,9 @@
 	(cd lib/vector/dglib/ ; $(MAKE) cleandocs ; $(MAKE) htmldocs)
 	(cd rfc/ ; $(MAKE) cleandocs ; $(MAKE) htmldocs)
 	(cd gui/wxpython/ ; $(MAKE) cleandocs ; $(MAKE) htmldocs)
-	(cd swig/; $(MAKE) cleandocs ; $(MAKE) htmldocs)
 
 packagehtmldocs: htmldocs
-	tar chvfz grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}refman_`date '+%Y_%m_%d'`_html.tar.gz lib/db/html lib/g3d/html lib/gis/html lib/gmath/html lib/gpde/html lib/proj/html lib/python/html lib/ogsf/html lib/segment/html lib/vector/html lib/vector/dglib/html gui/wxpython/html rfc/html swig/html
+	tar chvfz grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}refman_`date '+%Y_%m_%d'`_html.tar.gz lib/db/html lib/g3d/html lib/gis/html lib/gmath/html lib/gpde/html lib/proj/html lib/python/html lib/ogsf/html lib/segment/html lib/vector/html lib/vector/dglib/html gui/wxpython/html rfc/html
 
 #alternatively, the docs can be generated as single PDF document (see doxygen FAQ for 'TeX capacity exceeded'):
 #  (cd lib/ ; make pdfdocs)
@@ -420,8 +416,7 @@
 	(cd lib/vector/dglib/ ; $(MAKE) cleandocs ; $(MAKE) pdfdocs)
 	(cd gui/wxpython/ ; $(MAKE) cleandocs ; $(MAKE) pdfdocs)
 	(cd rfc/ ; $(MAKE) cleandocs ; $(MAKE) pdfdocs)
-	(cd swig/; $(MAKE) cleandocs ; $(MAKE) pdfdocs)
-	@echo "Written PDF docs in: lib/db/latex/, lib/g3d/latex/, lib/gis/latex/, lib/gmath/latex/ lib/gpde/latex/ lib/ogsf/latex/, lib/proj/latex/, lib/python/latex/, lib/segment/latex/, lib/vector/latex/, lib/vector/dglib/latex/, gui/wxpython/, rfc/latex/, swig/latex/"
+	@echo "Written PDF docs in: lib/db/latex/, lib/g3d/latex/, lib/gis/latex/, lib/gmath/latex/ lib/gpde/latex/ lib/ogsf/latex/, lib/proj/latex/, lib/python/latex/, lib/segment/latex/, lib/vector/latex/, lib/vector/dglib/latex/, gui/wxpython/, rfc/latex/"
 
 cleandocs:
 	(cd lib/db/ ; $(MAKE) cleandocs)
@@ -438,7 +433,6 @@
 	(cd lib/ ; $(MAKE) cleandocs)
 	(cd gui/wxpython/ ; $(MAKE) cleandocs)
 	(cd rfc/ ; $(MAKE) cleandocs)
-	(cd swig/; $(MAKE) cleandocs)
 
 html2pdfdoc:
 	@ echo "Light PDF document from modules' HTML documentation"

Modified: grass/branches/develbranch_6/configure
===================================================================
--- grass/branches/develbranch_6/configure	2010-08-15 20:36:09 UTC (rev 43123)
+++ grass/branches/develbranch_6/configure	2010-08-15 22:18:50 UTC (rev 43124)
@@ -16481,7 +16481,7 @@
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "include/Make/Grass.make include/Make/Platform.make include/version.h include/winname.h swig/perl/Makefile.PL swig/perl2/make.pl grass.pc include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "include/Make/Grass.make include/Make/Platform.make include/version.h include/winname.h grass.pc include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -16747,7 +16747,7 @@
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"include/Make/Grass.make include/Make/Platform.make include/version.h include/winname.h swig/perl/Makefile.PL swig/perl2/make.pl grass.pc"}
+CONFIG_FILES=\${CONFIG_FILES-"include/Make/Grass.make include/Make/Platform.make include/version.h include/winname.h grass.pc"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

Modified: grass/branches/develbranch_6/configure.in
===================================================================
--- grass/branches/develbranch_6/configure.in	2010-08-15 20:36:09 UTC (rev 43123)
+++ grass/branches/develbranch_6/configure.in	2010-08-15 22:18:50 UTC (rev 43124)
@@ -2004,7 +2004,7 @@
 GRASS_HOME="${DSTDIR}"
 AC_SUBST(GRASS_HOME)
 
-AC_OUTPUT(include/Make/Grass.make include/Make/Platform.make include/version.h include/winname.h swig/perl/Makefile.PL swig/perl2/make.pl grass.pc)
+AC_OUTPUT(include/Make/Grass.make include/Make/Platform.make include/version.h include/winname.h grass.pc)
 
 LOC_MSG([Copying config.status to config.status.${ARCH}])
 cp -f config.status config.status.${ARCH}