[GRASS-SVN] r33462 - grass/trunk/swig/python

[svn_grass at osgeo.org]

Author: glynn
Date: 2008-09-16 03:35:35 -0400 (Tue, 16 Sep 2008)
New Revision: 33462

Removed:
   grass/trunk/swig/python/interfaces/
Modified:
   grass/trunk/swig/python/Makefile
   grass/trunk/swig/python/python_grass7.i
Log:
Remove interfaces/*.i; use header files directly


Modified: grass/trunk/swig/python/Makefile
===================================================================
--- grass/trunk/swig/python/Makefile	2008-09-16 07:33:46 UTC (rev 33461)
+++ grass/trunk/swig/python/Makefile	2008-09-16 07:35:35 UTC (rev 33462)
@@ -3,9 +3,9 @@
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
-CFLAGS=-c -fpic -I./ -I$(ARCH_DISTDIR)/include $(GDALCFLAGS) $(PYTHONCFLAGS)
+CFLAGS=-c -fpic -I. $(ARCH_INC) $(GDALCFLAGS) $(PYTHONCFLAGS)
 
-LDFLAGS=-shared -L$(ARCH_LIBDIR) $(GDALLIBS) $(PYTHONLDFLAGS) -lgrass_I -lgrass_Iortho -lgrass_bitmap -lgrass_btree -lgrass_cdhc -lgrass_datetime -lgrass_dbmibase -lgrass_dbmiclient -lgrass_dbmidriver -lgrass_dbstubs -lgrass_dgl -lgrass_display -lgrass_dspf -lgrass_edit -lgrass_form -lgrass_g3d -lgrass_gis -lgrass_gmath -lgrass_gproj -lgrass_interpdata -lgrass_interpfl -lgrass_linkm -lgrass_qtree -lgrass_raster -lgrass_rowio -lgrass_rtree -lgrass_segment -lgrass_shape -lgrass_sites -lgrass_symb -lgrass_trans -lgrass_vask -lgrass_vect -lgrass_psdriver
+LDFLAGS=-shared -L$(ARCH_LIBDIR) $(GDALLIBS) $(PYTHONLDFLAGS) $(VECTLIB) $(IMAGERYLIB) $(GISLIB)
 
 # TODO: build the NumPtr module. See NumPtr/README.GRASS
 #SUBDIRS = NumPtr
@@ -17,8 +17,7 @@
 	-rm -f *.o *.so python_grass7_wrap.c python_grass7.pyc python_grass7.py
 
 python_grass7_wrap.c: python_grass7.i
-	$(MAKE) -C interfaces
-	$(SWIG) -python -shadow $<
+	$(SWIG) $(ARCH_INC) -python -shadow $<
 
 
 python_grass7_wrap.o: python_grass7_wrap.c

Modified: grass/trunk/swig/python/python_grass7.i
===================================================================
--- grass/trunk/swig/python/python_grass7.i	2008-09-16 07:33:46 UTC (rev 33461)
+++ grass/trunk/swig/python/python_grass7.i	2008-09-16 07:35:35 UTC (rev 33462)
@@ -24,11 +24,11 @@
 
 %include "my_typemaps.i"
 %include "renames.i"
-%include "interfaces/gis.i"
-%include "interfaces/gisdefs.i"
-%include "interfaces/imagery.i"
-%include "interfaces/imagedefs.i"
-%include "interfaces/vect.i"
-%include "interfaces/dig_structs.i"
-%include "interfaces/dig_types.i"
+%include "grass/gis.h"
+%include "grass/gisdefs.h"
+%include "grass/imagery.h"
+%include "grass/imagedefs.h"
+%include "grass/Vect.h"
+%include "grass/vect/dig_structs.h"
+%include "grass/vect/dig_defines.h"