[GRASS-SVN] r32430 - grass/branches/develbranch_6/lib/vector/dglib

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Jul 31 16:34:01 EDT 2008


Author: neteler
Date: 2008-07-31 16:34:01 -0400 (Thu, 31 Jul 2008)
New Revision: 32430

Modified:
   grass/branches/develbranch_6/lib/vector/dglib/Makefile
Log:
Parallel make fixes (merge from trunk)

Modified: grass/branches/develbranch_6/lib/vector/dglib/Makefile
===================================================================
--- grass/branches/develbranch_6/lib/vector/dglib/Makefile	2008-07-31 20:26:19 UTC (rev 32429)
+++ grass/branches/develbranch_6/lib/vector/dglib/Makefile	2008-07-31 20:34:01 UTC (rev 32430)
@@ -17,40 +17,19 @@
 
 DGLINC = $(ARCH_INCDIR)/dgl
 
-default: $(DGLINC)/avl.h $(DGLINC)/tavl.h $(DGLINC)/graph.h $(DGLINC)/heap.h \
+default: headers
+	$(MAKE) lib
+
+headers: $(DGLINC)/avl.h $(DGLINC)/tavl.h $(DGLINC)/graph.h $(DGLINC)/heap.h \
 	 $(DGLINC)/tree.h $(DGLINC)/type.h $(DGLINC)/helpers.h $(DGLINC)/graph_v1.h $(DGLINC)/graph_v2.h \
-	 $(ARCH_INCDIR)/dgl.h lib
+	 $(ARCH_INCDIR)/dgl.h
 
-$(DGLINC)/avl.h: avl.h
-	$(MKDIR) $(DGLINC)
-	$(INSTALL_DATA) avl.h $(DGLINC)/avl.h
+$(DGLINC)/%.h: %.h
+	-test -d $(DGLINC) || $(MKDIR) $(DGLINC)
+	$(INSTALL_DATA) $^ $@
 
-$(DGLINC)/tavl.h: tavl.h
-	$(INSTALL_DATA) tavl.h $(DGLINC)/tavl.h
-
-$(DGLINC)/heap.h: heap.h
-	$(INSTALL_DATA) heap.h $(DGLINC)/heap.h
-
-$(DGLINC)/graph.h: graph.h
-	$(INSTALL_DATA) graph.h $(DGLINC)/graph.h
-
-$(DGLINC)/tree.h: tree.h
-	$(INSTALL_DATA) tree.h $(DGLINC)/tree.h
-
-$(DGLINC)/type.h: type.h
-	$(INSTALL_DATA) type.h $(DGLINC)/type.h
-
-$(DGLINC)/graph_v1.h: graph_v1.h
-	$(INSTALL_DATA) graph_v1.h $(DGLINC)/graph_v1.h
-
-$(DGLINC)/graph_v2.h: graph_v2.h
-	$(INSTALL_DATA) graph_v2.h $(DGLINC)/graph_v2.h
-
-$(DGLINC)/helpers.h: helpers.h
-	$(INSTALL_DATA) helpers.h $(DGLINC)/helpers.h
-
 $(ARCH_INCDIR)/dgl.h: dgl.h
-	$(INSTALL_DATA) dgl.h $(ARCH_INCDIR)/dgl.h
+	$(INSTALL_DATA) $^ $@
 
 #doxygen:
 DOXNAME=dg



More information about the grass-commit mailing list