[GRASS-SVN] r40665 - in grass/trunk: general/g.version include

[svn_grass at osgeo.org]

Author: glynn
Date: 2010-01-26 07:33:20 -0500 (Tue, 26 Jan 2010)
New Revision: 40665

Removed:
   grass/trunk/general/g.version/sed.script
Modified:
   grass/trunk/general/g.version/Makefile
   grass/trunk/general/g.version/main.c
   grass/trunk/include/Makefile
Log:
Move creation of copying.h, confparms.h from general/g.version to include
Remove cruft


Modified: grass/trunk/general/g.version/Makefile
===================================================================
--- grass/trunk/general/g.version/Makefile	2010-01-26 12:31:40 UTC (rev 40664)
+++ grass/trunk/general/g.version/Makefile	2010-01-26 12:33:20 UTC (rev 40665)
@@ -4,18 +4,13 @@
 
 # cat the COPYING file, add a c line-break \n at each line end
 # and remove the unix newline. 
-COPYING := $(shell cat $(MODULE_TOPDIR)/COPYING | sed -f sed.script | tr -d '\012')
-GRASS_CONFIGURE_PARAMS := $(shell head -n 7 $(MODULE_TOPDIR)/config.status | tail -n 1 | tr -d '\012')
 
 EXTRA_CFLAGS = \
 	-DGRASS_VERSION_NUMBER=\"'$(GRASS_VERSION_NUMBER)'\" \
 	-DGRASS_VERSION_DATE=\"'$(GRASS_VERSION_DATE)'\" \
 	-DGRASS_VERSION_SVN=\"'$(GRASS_VERSION_SVN)'\" \
-	-DGRASS_VERSION_UPDATE_PKG=\"'$(GRASS_VERSION_UPDATE_PKG)'\" \
-	-I$(OBJDIR)
+	-DGRASS_VERSION_UPDATE_PKG=\"'$(GRASS_VERSION_UPDATE_PKG)'\"
 
-EXTRA_HEADERS = $(OBJDIR)/copying.h $(OBJDIR)/confparms.h
-
 LIBES = $(GISLIB)
 DEPENDENCIES = $(GISDEP)
 
@@ -23,8 +18,3 @@
 
 default: cmd
 
-$(OBJDIR)/copying.h: $(MODULE_TOPDIR)/COPYING | $(OBJDIR)
-	sed -e 's/^\(.*\)$$/"\1\\n"/' $< > $@
-
-$(OBJDIR)/confparms.h: $(MODULE_TOPDIR)/config.status | $(OBJDIR)
-	sed -n '7s/^#\(.*\)$$/"\1"/p' $< > $@

Modified: grass/trunk/general/g.version/main.c
===================================================================
--- grass/trunk/general/g.version/main.c	2010-01-26 12:31:40 UTC (rev 40664)
+++ grass/trunk/general/g.version/main.c	2010-01-26 12:33:20 UTC (rev 40665)
@@ -25,11 +25,11 @@
 #endif
 
 static const char COPYING[] =
-#include "copying.h"
+#include <grass/copying.h>
 ;
 
 static const char GRASS_CONFIGURE_PARAMS[] =
-#include "confparms.h"
+#include <grass/confparms.h>
 ;
 
 int main(int argc, char *argv[])

Deleted: grass/trunk/general/g.version/sed.script
===================================================================
--- grass/trunk/general/g.version/sed.script	2010-01-26 12:31:40 UTC (rev 40664)
+++ grass/trunk/general/g.version/sed.script	2010-01-26 12:33:20 UTC (rev 40665)
@@ -1 +0,0 @@
-s/.*$/&\\n/g

Modified: grass/trunk/include/Makefile
===================================================================
--- grass/trunk/include/Makefile	2010-01-26 12:31:40 UTC (rev 40664)
+++ grass/trunk/include/Makefile	2010-01-26 12:33:20 UTC (rev 40665)
@@ -5,11 +5,12 @@
 
 SRCH := $(wildcard ../include/*.h ../include/vect/*.h ../include/iostream/*.h)
 DSTH := $(patsubst ../include/%.h,$(ARCH_INCDIR)/%.h,$(SRCH))
+DSTH_EXTRA = $(ARCH_INCDIR)/copying.h $(ARCH_INCDIR)/confparms.h
 
 SRCMAKE := $(wildcard ../include/Make/*.make)
 DSTMAKE := $(patsubst ../include/Make/%.make,$(ARCH_DISTDIR)/include/Make/%.make,$(SRCMAKE))
 
-default: $(DSTH) $(DSTMAKE)
+default: $(DSTH) $(DSTH_EXTRA) $(DSTMAKE)
 
 # cancel rule from Rules.make
 $(ARCH_INCDIR)/%.h: %.h
@@ -35,3 +36,8 @@
 $(ARCH_DISTDIR)/include/Make:
 	$(MKDIR) $@
 
+$(ARCH_INCDIR)/copying.h: $(MODULE_TOPDIR)/COPYING | $(ARCH_INCDIR)
+	sed -e 's/^\(.*\)$$/"\1\\n"/' $< > $@
+
+$(ARCH_INCDIR)/confparms.h: $(MODULE_TOPDIR)/config.status | $(ARCH_INCDIR)
+	sed -n '7s/^#\(.*\)$$/"\1"/p' $< > $@