[GRASS-CVS] [addons] r1253 - in trunk/grassaddons/gui: . display_driver

[grass-commit-addons at grass.itc.it]

Author: landa
Date: 2007-12-07 11:45:34 +0100 (Fri, 07 Dec 2007)
New Revision: 1253

Modified:
   trunk/grassaddons/gui/README
   trunk/grassaddons/gui/display_driver/Makefile
Log:
Cosmetics: simplify display driver compilation instructions

Modified: trunk/grassaddons/gui/README
===================================================================
--- trunk/grassaddons/gui/README	2007-12-07 10:27:46 UTC (rev 1252)
+++ trunk/grassaddons/gui/README	2007-12-07 10:45:34 UTC (rev 1253)
@@ -153,20 +153,14 @@
 To enable digitization tool you need to compile display driver located
 in directory 'display_driver'.
 
-Before compiling the driver go to the wxPython directory, e.g.
+$ cd $GISBASE/etc/wx/display_driver
 
-$ cd /usr/lib/python2.4/site-packages/wx-2.8-gtk2-unicode/wx
+Make symlink, e.g.
 
-Make symlink
+$ ln -s /usr/lib/python2.4/site-packages/wx-2.8-gtk2-unicode/wx/_gdi_.so libgdi.so
 
-sudo ln -s _gdi_.so libgdi.so
-
-Add /usr/lib/python2.4/site-packages/wx-2.8-gtk2-unicode/wx to
-LIBRARY_PATH or edit /etc/ld.so.conf file.
-
 Then you can compile the driver
 
-$ cd $GISBASE/etc/wx/display_driver
 $ make
 
 Note: You probably will need to modify the Makefile. This need to be

Modified: trunk/grassaddons/gui/display_driver/Makefile
===================================================================
--- trunk/grassaddons/gui/display_driver/Makefile	2007-12-07 10:27:46 UTC (rev 1252)
+++ trunk/grassaddons/gui/display_driver/Makefile	2007-12-07 10:45:34 UTC (rev 1253)
@@ -10,9 +10,9 @@
 
 SWIG=swig
 
-CFLAGS=-c -fpic -I/usr/include/python$(PYTHONVERSION) -I./ -I$(ARCH_DISTDIR)/include `wx-config --cxxflags`
+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/usr/lib/python$(PYTHONVERSION)/site-packages/wx-2.8-gtk2-unicode/wx -lgdi
+LDFLAGS=-shared -fpic -L$(ARCH_LIBDIR) -lgrass_vect -lgrass_gis `wx-config --libs` -L./ -lgdi
 
 default: grass6_wxdriver.so