Retain local copies of modules

Fix test script


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@35429 15284696-431f-4ddb-bdfa-cd5b030d7da7

swig/python/Makefile

@@ -27,7 +27,7 @@ proj_wrap_c_FLAGS = $(PROJINC) $(GDALCFLAGS)
 
 EXTRA_SWIG = my_typemaps.i common.i
 EXTRA_CFLAGS = $(PYMOD_CFLAGS)
-EXTRA_CLEAN_FILES := $(foreach M,$(MODULES),$(M)_wrap.o $(M)_wrap.c $(M).pyc $(M).py)
+EXTRA_CLEAN_FILES := $(foreach M,$(MODULES),$(M)_wrap.o $(M)_wrap.c $(M).pyc $(M).py _$(M).so)
 CLEAN_SUBDIRS = NumPtr
 
 include $(MODULE_TOPDIR)/include/Make/Python.make
@@ -59,7 +59,9 @@ numptr:
 
 .PHONY: numptr
 
-.KEEP: $(patsubst %,$(OBJDIR)/%_wrap.o,$(MODULES))
+.SECONDARY: $(patsubst %,$(OBJDIR)/%_wrap.o,$(MODULES))
+
+.SECONDARY: $(patsubst %,_%.so,$(MODULES))
 
 date_wrap.c: $(ARCH_INCDIR)/datetime.h
 date_wrap.c: $(ARCH_INCDIR)/P_datetime.h

swig/python/test.py

@@ -5,7 +5,7 @@
 
 
 import os, sys
-import python_grass7 as g7lib
+import grass
 
 if not os.environ.has_key("GISBASE"):
     print "You must be in GRASS GIS to run this program."
@@ -14,16 +14,16 @@ if not os.environ.has_key("GISBASE"):
 rname = 'elevation.dem'
 mapset = 'PERMANENT'
 
-g7lib.G_gisinit('')
-g7lib.G_find_cell2(rname,'')
+grass.G_gisinit('')
+grass.G_find_cell2(rname,'')
 
 print mapset
 
 print 'prints 0 if map was found'
 
 print 'roads:'
-print g7lib.G_raster_map_type('roads',mapset)
+print grass.G_raster_map_type('roads',mapset)
 
 print 'elevation.dem:'
-print g7lib.G_raster_map_type(rname,mapset)
+print grass.G_raster_map_type(rname,mapset)