[GRASS-SVN] r30668 - in grass/branches/releasebranch_6_3/gui/wxpython: . vdigit

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-03-21 06:12:47 -0400 (Fri, 21 Mar 2008)
New Revision: 30668

Modified:
   grass/branches/releasebranch_6_3/gui/wxpython/Makefile
   grass/branches/releasebranch_6_3/gui/wxpython/vdigit/Makefile
Log:
wxGUI: Fix dependency information so that parallel builds work (backported from trunk, r30665, r30666, r30667)


Modified: grass/branches/releasebranch_6_3/gui/wxpython/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/gui/wxpython/Makefile	2008-03-21 06:29:13 UTC (rev 30667)
+++ grass/branches/releasebranch_6_3/gui/wxpython/Makefile	2008-03-21 10:12:47 UTC (rev 30668)
@@ -12,7 +12,8 @@
 
 ETCDIR = $(ETC)/wxpython
 
-default: install_scripts parsubdirs
+default: install_scripts
+	$(MAKE) parsubdirs
 
 install_scripts:
 	$(MKDIR) $(ETCDIR) $(ETCDIR)/compat $(ETCDIR)/gui_modules $(ETCDIR)/icons $(ETCDIR)/icons/silk $(ETCDIR)/images $(ETCDIR)/scripts $(ETCDIR)/vdigit 

Modified: grass/branches/releasebranch_6_3/gui/wxpython/vdigit/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/gui/wxpython/vdigit/Makefile	2008-03-21 06:29:13 UTC (rev 30667)
+++ grass/branches/releasebranch_6_3/gui/wxpython/vdigit/Makefile	2008-03-21 10:12:47 UTC (rev 30668)
@@ -17,7 +17,7 @@
 
 SHLIB = _grass6_wxvdigit$(SHLIB_SUFFIX)
 
-default: $(SHLIB) install_vdigit
+default: install_vdigit
 
 clean:
 	-rm -rf $(OBJARCH) _grass6_wxvdigit.so grass6_wxvdigit.i	 
@@ -38,6 +38,6 @@
 $(SHLIB): $(OBJ)
 	$(SHLIB_LD) $(LDFLAGS) $(OBJ) -o $(SHLIB) 
 
-install_vdigit:
-	$(INSTALL_DATA) _grass6_wxvdigit.so $(ETCDIR)/vdigit/
+install_vdigit: $(SHLIB)
+	$(INSTALL_DATA) $(SHLIB) $(ETCDIR)/vdigit/
 	$(INSTALL_DATA) grass6_wxvdigit.py $(ETCDIR)/vdigit/