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

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-03-10 11:02:59 -0400 (Mon, 10 Mar 2008)
New Revision: 30523

Modified:
   grass/trunk/gui/wxpython/vdigit/Makefile
Log:
wxGUI (vdigit) hardwired compile and link flags removed (trac #61)


Modified: grass/trunk/gui/wxpython/vdigit/Makefile
===================================================================
--- grass/trunk/gui/wxpython/vdigit/Makefile	2008-03-10 13:40:47 UTC (rev 30522)
+++ grass/trunk/gui/wxpython/vdigit/Makefile	2008-03-10 15:02:59 UTC (rev 30523)
@@ -5,9 +5,9 @@
 
 SWIG = swig
 
-CXXFLAGS = -c ${SHLIB_CFLAGS} -I$(ARCH_DISTDIR)/include $(GDALCFLAGS) $(PYTHONCFLAGS) $(WXWIDGETSCXXFLAGS)
+CXXFLAGS += $(SHLIB_CFLAGS) $(GDALCFLAGS) $(PYTHONCFLAGS) $(WXWIDGETSCXXFLAGS)
 
-LDFLAGS = -shared ${SHLIB_CFLAGS} -L$(ARCH_LIBDIR) $(VECTLIB) $(GISLIB) $(GDALLIBS) $(VEDITLIB) $(WXWIDGETSLIB) -lgdi 
+LDFLAGS += $(SHLIB_LDFLAGS) -L$(ARCH_LIBDIR) $(VECTLIB) $(GISLIB) $(GDALLIBS) $(VEDITLIB) $(WXWIDGETSLIB) $(PYTHONLDFLAGS) -lgdi
 
 LOCAL_HEADERS = digit.h driver.h
 SOURCES = driver.cpp digit.cpp cats.cpp line.cpp vertex.cpp select.cpp grass6_wxvdigit_wrap.cpp
@@ -17,8 +17,10 @@
 
 ETCDIR = $(ETC)/wxpython
 
-default: grass6_wxvdigit.so install_vdigit
+SHLIB = _grass6_wxvdigit$(SHLIB_SUFFIX)
 
+default: $(SHLIB) install_vdigit
+
 clean:
 	-rm -rf $(OBJARCH) _grass6_wxvdigit.so grass6_wxvdigit.i	 
 
@@ -33,10 +35,10 @@
 	$(SWIG) -c++ -python -shadow -o grass6_wxvdigit_wrap.cpp $<
 
 $(OBJARCH)/%.o: %.cpp $(LOCAL_HEADERS)
-	$(CXX) $(CXXFLAGS) $(INCLUDE_DIRS) $< -o $@
+	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-grass6_wxvdigit.so: $(OBJ)
-	$(CXX) $(LDFLAGS) $(OBJ) -o _grass6_wxvdigit.so
+$(SHLIB): $(OBJ)
+	$(SHLIB_LD) $(LDFLAGS) $(OBJ) -o $(SHLIB) 
 
 install_vdigit:
 	$(INSTALL_DATA) _grass6_wxvdigit.so $(ETCDIR)/vdigit/