[GRASS-SVN] r33442 - grass/trunk/swig/python/interfaces

[svn_grass at osgeo.org]

Author: hamish
Date: 2008-09-14 03:06:32 -0400 (Sun, 14 Sep 2008)
New Revision: 33442

Modified:
   grass/trunk/swig/python/interfaces/Makefile
Log:
fix problems due to indent making some some fns multiline (trac #308; merge from devbr6)

Modified: grass/trunk/swig/python/interfaces/Makefile
===================================================================
--- grass/trunk/swig/python/interfaces/Makefile	2008-09-14 07:03:46 UTC (rev 33441)
+++ grass/trunk/swig/python/interfaces/Makefile	2008-09-14 07:06:32 UTC (rev 33442)
@@ -1,17 +1,41 @@
 # auto-generate typedef file
+# variadic functions and #includes are removed.
 
 # Note: gis contains the raster data API
+
+HEADER_LINE1 = "/* auto-generated swig typedef file  `date` */"
+HEADER_LINE2 = '/* variadic functions and included headers have been removed */'
+
 all: gis vector
 
 gis:
-	echo "/* auto-generate swig typedef file (with some GRASS functions removed) */" > gisdefs.i
-	cat ../../../include/gisdefs.h | grep -v '#\|asprintf\|G_snprintf\|G_debug\|G_fatal_error\|G_warning\|G_verbose\|lzw\|G_done_msg\|G_message\|G_important_message' >> gisdefs.i
+	echo $(HEADER_LINE1) >  gisdefs.i
+	echo $(HEADER_LINE2) >> gisdefs.i
+	echo >> gisdefs.i
+	cat ../../../include/gisdefs.h | \
+		sed -e '/\.\.\..*;/d' -e '/\.\.\./,/;/d' \
+		-e '/^#/d' >> gisdefs.i
+#	gis.h  (gis.i based on gis.h c.12/17/04 (r16393)
 
 vector:
-	echo "/* auto-generate swig typedef file */" > dig_structs.i
-	cat ../../../include/vect/dig_structs.h >> dig_structs.i
-	echo "/* auto-generate swig typedef file */" > vect.i
-	cat ../../../include/Vect.h | grep -v 'V1_\|V2_' >> vect.i
+	echo $(HEADER_LINE1) >  dig_structs.i
+	echo $(HEADER_LINE2) >> dig_structs.i
+	echo >> dig_structs.i
+	cat ../../../include/vect/dig_structs.h | \
+		sed -e '/^#include.*>/d' \
+		-e '/^#.*DIG___STRUCTS___/d' >> dig_structs.i
+	echo $(HEADER_LINE1) >  vect.i
+	echo $(HEADER_LINE2) >> vect.i
+	echo >> vect.i
+	cat ../../../include/Vect.h | \
+		sed -e '/V[12]_.*;/d' -e '/V[12]_/,/;/d' \
+		-e '/^#/d' >> vect.i
+#	generate dig_types.i from include/vect/dig_defines.h
+#
+#imagery:
+#	imagedefs.h
+#	imagery.h
 
 distclean:
 	-rm -f gisdefs.i dig_structs.i vect.i
+	# gis.i dig_types.i imagedefs.h imagery.h