Browse Source

Move SWIG interfaces to swig/include

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@37387 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 16 years ago
parent
commit
63d48f1c5c

swig/python/arraystats.i → swig/include/arraystats.i


swig/python/cluster.i → swig/include/cluster.i


swig/python/date.i → swig/include/date.i


swig/python/dbmi.i → swig/include/dbmi.i


swig/python/display.i → swig/include/display.i


swig/python/g3d.i → swig/include/g3d.i


swig/python/grass.i → swig/include/grass.i


swig/python/imagery.i → swig/include/imagery.i


swig/python/math.i → swig/include/math.i


swig/python/proj.i → swig/include/proj.i


swig/python/common.i → swig/include/python/common.i


swig/python/my_typemaps.i → swig/include/python/my_typemaps.i


swig/python/utils.i → swig/include/python/utils.i


swig/python/raster.i → swig/include/raster.i


swig/python/stats.i → swig/include/stats.i


swig/python/trans.i → swig/include/trans.i


swig/python/vector.i → swig/include/vector.i


swig/python/vedit.i → swig/include/vedit.i


+ 8 - 1
swig/python/Makefile

@@ -32,7 +32,8 @@ vedit_LIBS      = $(VEDITLIB)
 vector_wrap_c_FLAGS = $(VECT_INC)
 proj_wrap_c_FLAGS = $(PROJINC) $(GDALCFLAGS)
 
-EXTRA_SWIG = my_typemaps.i common.i
+EXTRA_SWIG = ../include/python/my_typemaps.i ../include/python/common.i
+SWIGFLAGS = $(ARCH_INC) -I../include/python -outdir .
 EXTRA_CFLAGS = $(PYMOD_CFLAGS)
 EXTRA_CLEAN_FILES := $(foreach M,$(MODULES),$(M)_wrap.o $(M)_wrap.c $(M).pyc $(M).py _$(M).so)
 CLEAN_SUBDIRS = NumPtr
@@ -50,6 +51,12 @@ default:
 	$(MAKE) $(DSTDIR)
 	$(MAKE) $(LIBFILES) $(PYFILES)
 
+%_wrap.c %.py: ../include/%.i $(EXTRA_SWIG)
+	$(SWIG) $(SWIGFLAGS) -python -o $*_wrap.c -module $* -shadow $<
+
+%_wrap.c %.py: ../include/python/%.i $(EXTRA_SWIG)
+	$(SWIG) $(SWIGFLAGS) -python -o $*_wrap.c -module $* -shadow $<
+
 $(PYDIR):
 	test -d $@ || $(MKDIR) -p $@