[GRASS-SVN] r40211 - in grass/trunk: . include include/Make lib

[svn_grass at osgeo.org]

Author: glynn
Date: 2010-01-03 17:41:38 -0500 (Sun, 03 Jan 2010)
New Revision: 40211

Added:
   grass/trunk/include/Makefile
Modified:
   grass/trunk/Makefile
   grass/trunk/include/Make/Dir.make
   grass/trunk/include/Make/Rules.make
   grass/trunk/lib/Makefile
Log:
Move installation of headers from lib/Makefile to include/Makefile


Modified: grass/trunk/Makefile
===================================================================
--- grass/trunk/Makefile	2010-01-03 19:49:48 UTC (rev 40210)
+++ grass/trunk/Makefile	2010-01-03 22:41:38 UTC (rev 40211)
@@ -36,6 +36,7 @@
 DIRS = \
 	demolocation \
 	tools \
+	include \
 	lib \
 	db \
 	display \

Modified: grass/trunk/include/Make/Dir.make
===================================================================
--- grass/trunk/include/Make/Dir.make	2010-01-03 19:49:48 UTC (rev 40210)
+++ grass/trunk/include/Make/Dir.make	2010-01-03 22:41:38 UTC (rev 40211)
@@ -12,14 +12,12 @@
 subdirs:
 	@list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
-	    echo $$subdir ; \
 	    $(MAKE) -C $$subdir || echo $(CURDIR)/$$subdir >> $(ERRORLOG) ; \
 	done
 
 cleansubdirs:
 	@list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
-	    echo $$subdir ; \
 	    $(MAKE) -C $$subdir clean; \
 	done
 

Modified: grass/trunk/include/Make/Rules.make
===================================================================
--- grass/trunk/include/Make/Rules.make	2010-01-03 19:49:48 UTC (rev 40210)
+++ grass/trunk/include/Make/Rules.make	2010-01-03 22:41:38 UTC (rev 40211)
@@ -41,7 +41,8 @@
 	-rm -rf $(OBJDIR) $(EXTRA_CLEAN_DIRS)
 	-rm -f $(EXTRA_CLEAN_FILES) *.tab.[ch] *.yy.c *.output *.backup *.tmp.html *.pyc
 	-if [ "$(CLEAN_SUBDIRS)" != "" ] ; then \
-		for dir in $(CLEAN_SUBDIRS) ; do \
+		@list='$(CLEAN_SUBDIRS)' ; \
+		for dir in $$list ; do \
 			$(MAKE) -C $$dir clean ; \
 		done ; \
 	fi

Added: grass/trunk/include/Makefile
===================================================================
--- grass/trunk/include/Makefile	                        (rev 0)
+++ grass/trunk/include/Makefile	2010-01-03 22:41:38 UTC (rev 40211)
@@ -0,0 +1,38 @@
+MODULE_TOPDIR = ..
+
+include $(MODULE_TOPDIR)/include/Make/Vars.make
+
+SRCH := $(wildcard ../include/*.h ../include/vect/*.h ../include/iostream/*.h)
+DSTH := $(patsubst ../include/%.h,$(ARCH_INCDIR)/%.h,$(SRCH))
+
+SRCMAKE := $(wildcard ../include/Make/*.make)
+DSTMAKE := $(patsubst ../include/Make/%.make,$(ARCH_DISTDIR)/include/Make/%.make,$(SRCMAKE))
+
+default: $(DSTH) $(DSTMAKE)
+
+$(ARCH_INCDIR)/vect/%.h: vect/%.h | $(ARCH_INCDIR)/vect
+	$(INSTALL_DATA) $< $@
+
+$(ARCH_INCDIR)/iostream/%.h: iostream/%.h | $(ARCH_INCDIR)/iostream
+	$(INSTALL_DATA) $< $@
+
+$(ARCH_INCDIR)/%.h: %.h | $(ARCH_INCDIR)
+	$(INSTALL_DATA) $< $@
+
+$(ARCH_INCDIR)/vect: | $(ARCH_INCDIR)
+	$(MKDIR) $@
+
+$(ARCH_INCDIR)/iostream: | $(ARCH_INCDIR)
+	$(MKDIR) $@
+
+$(ARCH_INCDIR): | $(ARCH_DISTDIR)
+	$(MKDIR) $@
+
+$(ARCH_DISTDIR)/include/Make/%.make: Make/%.make | $(ARCH_DISTDIR)/include/Make
+	$(INSTALL_DATA) $< $@
+
+$(ARCH_DISTDIR)/include/Make:
+	$(MKDIR) $@
+
+$(ARCH_DISTDIR):
+	$(MKDIR) $@

Modified: grass/trunk/lib/Makefile
===================================================================
--- grass/trunk/lib/Makefile	2010-01-03 19:49:48 UTC (rev 40210)
+++ grass/trunk/lib/Makefile	2010-01-03 22:41:38 UTC (rev 40211)
@@ -50,30 +50,5 @@
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
-SRCH := $(wildcard ../include/*.h ../include/vect/*.h ../include/iostream/*.h)
-DSTH := $(patsubst ../include/%.h,$(ARCH_INCDIR)/%.h,$(SRCH))
+default: subdirs
 
-SRCMAKE := $(wildcard ../include/Make/*.make)
-DSTMAKE := $(patsubst ../include/Make/%.make,$(ARCH_DISTDIR)/include/Make/%.make,$(SRCMAKE))
-
-default: headers
-	$(MAKE) subdirs
-
-headers: $(DSTH) $(DSTMAKE)
-
-.PHONY: headers
-
-$(ARCH_INCDIR)/vect: | $(ARCH_INCDIR)
-	$(MKDIR) $@
-
-$(ARCH_INCDIR)/iostream: | $(ARCH_INCDIR)
-	$(MKDIR) $@
-
-$(ARCH_INCDIR)/%.h: ../include/%.h | $(ARCH_INCDIR) $(ARCH_INCDIR)/vect $(ARCH_INCDIR)/iostream
-	$(INSTALL_DATA) $< $@
-
-$(ARCH_DISTDIR)/include/Make/%.make: ../include/Make/%.make | $(ARCH_DISTDIR)/include/Make
-	$(INSTALL_DATA) $< $@
-
-$(ARCH_DISTDIR)/include/Make:
-	$(MKDIR) $@