[GRASS-SVN] r29932 - grass/trunk/gui/wxpython/vdigit

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-02-02 13:33:34 -0500 (Sat, 02 Feb 2008)
New Revision: 29932

Modified:
   grass/trunk/gui/wxpython/vdigit/Makefile.in
Log:
wx/vdigit: Makefile updated based on Glynn's notes http://www.nabble.com/Re%3A-new-digitization-tool-compilation-p15225107.html

Modified: grass/trunk/gui/wxpython/vdigit/Makefile.in
===================================================================
--- grass/trunk/gui/wxpython/vdigit/Makefile.in	2008-02-02 17:23:52 UTC (rev 29931)
+++ grass/trunk/gui/wxpython/vdigit/Makefile.in	2008-02-02 18:33:34 UTC (rev 29932)
@@ -10,9 +10,11 @@
 
 SWIG=swig
 
-CXXFLAGS=-c -fpic -I$(ARCH_DISTDIR)/include  -I/usr/include/python$(PYTHONVERSION) `wx-config --cxxflags`
+WXCXXFLAGS := $(shell wx-config --cxxflags)
+CXXFLAGS = -c -fpic -I$(ARCH_DISTDIR)/include -I/usr/include/python$(PYTHONVERSION) $(GDALCFLAGS) $(WXCXXFLAGS)
 
-LDFLAGS=-shared -fpic -L$(ARCH_LIBDIR) $(VECTLIB) $(GISLIB) $(GDALLIBS) $(VEDITLIB) `wx-config --libs` -lgdi
+WXLDFLAGS := $(shell wx-config --libs)
+LDFLAGS=-shared -fpic -L$(ARCH_LIBDIR) $(VECTLIB) $(GISLIB) $(GDALLIBS) $(VEDITLIB) -lgdi $(WXLDFLAGS)
 
 LOCAL_HEADERS=digit.h driver.h
 SOURCES=driver.cpp digit.cpp cats.cpp line.cpp vertex.cpp select.cpp
@@ -23,7 +25,7 @@
 default: grass6_wxvdigit.so
 
 clean:
-	-rm -rf $(OBJARCH) _grass6_wxvdigit.so grass6_wxvdigit_wrap.cxx grass6_wxvdigit.py grass6_wxvdigit.i grass6_wxvdigit.pyc	 
+	-rm -rf $(OBJARCH) _grass6_wxvdigit.so grass6_wxvdigit_wrap.cpp grass6_wxvdigit.py grass6_wxvdigit.i grass6_wxvdigit.pyc	 
 
 grass6_wxvdigit.i:
 	cat ./digit.i > grass6_wxvdigit.i
@@ -32,14 +34,14 @@
 	cat ./driver.h >> grass6_wxvdigit.i
 	cat ./digit.h >> grass6_wxvdigit.i
 
-grass6_wxvdigit_wrap.cxx: grass6_wxvdigit.i
-	$(SWIG) -c++ -python -shadow $<
+grass6_wxvdigit_wrap.cpp: grass6_wxvdigit.i
+	$(SWIG) -c++ -python -shadow -o $@ $<
 
-$(OBJARCH)/grass6_wxvdigit_wrap.o: grass6_wxvdigit_wrap.cxx $(OBJARCH)
-	$(CXX) -c $(CXXFLAGS) $(INCLUDE_DIRS) $< -o $@
+$(OBJARCH)/grass6_wxvdigit_wrap.o: grass6_wxvdigit_wrap.cpp $(OBJARCH)
+	$(CXX) $(CXXFLAGS) $(INCLUDE_DIRS) $< -o $@
 
 $(OBJARCH)/%.o: %.cpp $(LOCAL_HEADERS)
-	$(CXX) -c $(CXXFLAGS) $(INCLUDE_DIRS) $< -o $@
+	$(CXX) $(CXXFLAGS) $(INCLUDE_DIRS) $< -o $@
 
 grass6_wxvdigit.so: $(OBJARCH)/grass6_wxvdigit_wrap.o $(OBJ)
 	$(CXX) $(LDFLAGS) $(OBJARCH)/grass6_wxvdigit_wrap.o $(OBJ) -o _grass6_wxvdigit.so