[GRASS-SVN] r30798 - in grass/trunk/lib: external/shapelib rst/data rst/interp_float

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Mar 29 12:49:27 EDT 2008


Author: glynn
Date: 2008-03-29 12:49:27 -0400 (Sat, 29 Mar 2008)
New Revision: 30798

Modified:
   grass/trunk/lib/external/shapelib/Makefile
   grass/trunk/lib/rst/data/Makefile
   grass/trunk/lib/rst/interp_float/Makefile
Log:
Fix parallel build issues



Modified: grass/trunk/lib/external/shapelib/Makefile
===================================================================
--- grass/trunk/lib/external/shapelib/Makefile	2008-03-29 16:23:29 UTC (rev 30797)
+++ grass/trunk/lib/external/shapelib/Makefile	2008-03-29 16:49:27 UTC (rev 30798)
@@ -8,7 +8,8 @@
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-default: $(ARCH_INCDIR)/shapefil.h lib
+default: $(ARCH_INCDIR)/shapefil.h
+	$(MAKE) lib
 
 $(ARCH_INCDIR)/shapefil.h: shapefil.h
 	$(INSTALL_DATA) shapefil.h $(ARCH_INCDIR)/shapefil.h

Modified: grass/trunk/lib/rst/data/Makefile
===================================================================
--- grass/trunk/lib/rst/data/Makefile	2008-03-29 16:23:29 UTC (rev 30797)
+++ grass/trunk/lib/rst/data/Makefile	2008-03-29 16:49:27 UTC (rev 30798)
@@ -5,7 +5,8 @@
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-default: $(ARCH_INCDIR)/dataquad.h lib
+default: $(ARCH_INCDIR)/dataquad.h
+	$(MAKE) lib
 
 $(ARCH_INCDIR)/dataquad.h: dataquad.h
 	$(INSTALL_DATA) dataquad.h $(ARCH_INCDIR)/dataquad.h

Modified: grass/trunk/lib/rst/interp_float/Makefile
===================================================================
--- grass/trunk/lib/rst/interp_float/Makefile	2008-03-29 16:23:29 UTC (rev 30797)
+++ grass/trunk/lib/rst/interp_float/Makefile	2008-03-29 16:49:27 UTC (rev 30798)
@@ -11,8 +11,9 @@
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 
-default: $(ARCH_INCDIR)/interpf.h lib
+default: $(ARCH_INCDIR)/interpf.h
+	$(MAKE) lib
 
 $(ARCH_INCDIR)/interpf.h: interpf.h
-	cp interpf.h $(ARCH_INCDIR)/interpf.h
+	$(INSTALL_DATA) interpf.h $(ARCH_INCDIR)/interpf.h
 



More information about the grass-commit mailing list