[GRASS-SVN] r33460 - grass/branches/develbranch_6/swig/python/interfaces

[svn_grass at osgeo.org]

Author: hamish
Date: 2008-09-16 03:19:01 -0400 (Tue, 16 Sep 2008)
New Revision: 33460

Removed:
   grass/branches/develbranch_6/swig/python/interfaces/dig_types.i
Modified:
   grass/branches/develbranch_6/swig/python/interfaces/Makefile
Log:
autogen dig_types.i (merge from trunk)

Modified: grass/branches/develbranch_6/swig/python/interfaces/Makefile
===================================================================
--- grass/branches/develbranch_6/swig/python/interfaces/Makefile	2008-09-16 07:07:53 UTC (rev 33459)
+++ grass/branches/develbranch_6/swig/python/interfaces/Makefile	2008-09-16 07:19:01 UTC (rev 33460)
@@ -16,7 +16,6 @@
 		sed -e '/\.\.\..*;/d' -e '/\.\.\./,/;/d' \
 		-e '/^#/d' >> gisdefs.i
 	echo $(HEADER_LINE1) >  gis.i
-	echo $(HEADER_LINE2) >> gis.i
 	echo >> gis.i
 	cat ../../../include/gis.h | \
 		sed -e 'N;N;N;N;N;N;N;N;N; s/_Color_Rule_[ \t\n]*{[ \t\n]*\(.*}\) low.*/_Color_Rule_\n{\n    \1 low;\n    \1 high;\n/' \
@@ -35,12 +34,16 @@
 	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
+	echo $(HEADER_LINE1) >  dig_types.i
+	echo "/* extracted from include/vect/dig_defines.h */" >> dig_types.i
+	echo >> dig_types.i
+	cat ../../../include/vect/dig_defines.h | \
+		sed -n -e '/GV_POINT/,/GV_LINES/p' >> dig_types.i
 #
 #imagery:
 #	imagedefs.h
 #	imagery.h
 
 distclean:
-	-rm -f gisdefs.i gis.i dig_structs.i vect.i
-	# dig_types.i imagedefs.h imagery.h
+	-rm -f gisdefs.i gis.i dig_structs.i dig_types.i vect.i
+	# imagedefs.h imagery.h

Deleted: grass/branches/develbranch_6/swig/python/interfaces/dig_types.i
===================================================================
--- grass/branches/develbranch_6/swig/python/interfaces/dig_types.i	2008-09-16 07:07:53 UTC (rev 33459)
+++ grass/branches/develbranch_6/swig/python/interfaces/dig_types.i	2008-09-16 07:19:01 UTC (rev 33460)
@@ -1,13 +0,0 @@
-/* extracted from include/vect/dig_defines.h */
-
-#define GV_POINT      0x01
-#define GV_LINE       0x02
-#define GV_BOUNDARY   0x04
-#define GV_CENTROID   0x08
-#define GV_FACE       0x10
-#define GV_KERNEL     0x20
-#define GV_AREA       0x40
-#define GV_VOLUME     0x80
-
-#define GV_POINTS (GV_POINT | GV_CENTROID )
-#define GV_LINES (GV_LINE | GV_BOUNDARY )