[GRASS-SVN] r29404 - in grass/trunk: . gui/wxpython/display_driver

[svn_grass at osgeo.org]

Author: martinl
Date: 2007-12-11 09:08:09 -0500 (Tue, 11 Dec 2007)
New Revision: 29404

Removed:
   grass/trunk/gui/wxpython/display_driver/Makefile
Modified:
   grass/trunk/configure
   grass/trunk/configure.in
Log:
Generate also Makefile for wxPython GUI

Modified: grass/trunk/configure
===================================================================
--- grass/trunk/configure	2007-12-11 13:38:44 UTC (rev 29403)
+++ grass/trunk/configure	2007-12-11 14:08:09 UTC (rev 29404)
@@ -15075,7 +15075,7 @@
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "include/Make/Grass.make include/Make/Platform.make include/version.h include/winname.h swig/perl/Makefile.PL swig/perl2/make.pl swig/python/Makefile grass.pc include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "include/Make/Grass.make include/Make/Platform.make include/version.h include/winname.h swig/perl/Makefile.PL swig/perl2/make.pl swig/python/Makefile gui/wxpython/display_driver/Makefile grass.pc include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -15315,7 +15315,7 @@
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"include/Make/Grass.make include/Make/Platform.make include/version.h include/winname.h swig/perl/Makefile.PL swig/perl2/make.pl swig/python/Makefile grass.pc"}
+CONFIG_FILES=\${CONFIG_FILES-"include/Make/Grass.make include/Make/Platform.make include/version.h include/winname.h swig/perl/Makefile.PL swig/perl2/make.pl swig/python/Makefile gui/wxpython/display_driver/Makefile grass.pc"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

Modified: grass/trunk/configure.in
===================================================================
--- grass/trunk/configure.in	2007-12-11 13:38:44 UTC (rev 29403)
+++ grass/trunk/configure.in	2007-12-11 14:08:09 UTC (rev 29404)
@@ -1644,7 +1644,7 @@
 GRASS_HOME=${DSTDIR}
 AC_SUBST(GRASS_HOME)
 
-AC_OUTPUT(include/Make/Grass.make include/Make/Platform.make include/version.h include/winname.h swig/perl/Makefile.PL swig/perl2/make.pl swig/python/Makefile grass.pc)
+AC_OUTPUT(include/Make/Grass.make include/Make/Platform.make include/version.h include/winname.h swig/perl/Makefile.PL swig/perl2/make.pl swig/python/Makefile gui/wxpython/display_driver/Makefile grass.pc)
 
 LOC_MSG([Copying config.status to config.status.${ARCH}])
 cp -f config.status config.status.${ARCH}

Deleted: grass/trunk/gui/wxpython/display_driver/Makefile
===================================================================
--- grass/trunk/gui/wxpython/display_driver/Makefile	2007-12-11 13:38:44 UTC (rev 29403)
+++ grass/trunk/gui/wxpython/display_driver/Makefile	2007-12-11 14:08:09 UTC (rev 29404)
@@ -1,37 +0,0 @@
-### Note: This is working file, to compile on your machine you need
-### probably modify this Makefile...
-
-PYTHONVERSION=2.4
-
-MODULE_TOPDIR = ../../..
-
-include $(MODULE_TOPDIR)/include/Make/Lib.make
-include $(MODULE_TOPDIR)/include/Make/Doxygen.make
-
-SWIG=swig
-
-CFLAGS=-c -fpic -I/usr/include/python$(PYTHONVERSION) -I./ -I$(ARCH_DISTDIR)/include `wx-config --cxxflags` `gdal-config --cflags`
-
-LDFLAGS=-shared -fpic -L$(ARCH_LIBDIR) -lgrass_vect -lgrass_gis `wx-config --libs` -L./ -lgdi
-
-default: grass6_wxdriver.so
-
-clean:
-	-rm -f *.o _grass6_wxdriver.so grass6_wxdriver_wrap.cxx grass6_wxdriver.py grass6_wxdriver.i grass6_wxdriver.pyc	 
-
-grass6_wxdriver.i:
-	cat ./driver.i > grass6_wxdriver.i
-	echo "/* auto-generate swig typedef file (with some GRASS functions removed) */" >> grass6_wxdriver.i
-	cat ./driver.h >> grass6_wxdriver.i
-
-grass6_wxdriver_wrap.cxx: grass6_wxdriver.i
-	$(SWIG) -c++ -python -shadow $<
-
-grass6_wxdriver_wrap.o: grass6_wxdriver_wrap.cxx
-	$(CXX) $(CFLAGS) $(INCLUDE_DIRS) $<
-
-driver.o: driver.cpp driver.h
-	$(CXX) $(CFLAGS) $(INCLUDE_DIRS) $<
-
-grass6_wxdriver.so: grass6_wxdriver_wrap.o driver.o # pseudodc.o
-	$(CXX) $(LDFLAGS) grass6_wxdriver_wrap.o driver.o -o _grass6_wxdriver.so