[GRASS-SVN] r53573 - in grass/branches/develbranch_6: . include/Make tools

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-10-26 14:11:05 -0700 (Fri, 26 Oct 2012)
New Revision: 53573

Added:
   grass/branches/develbranch_6/tools/g.echo.c
Modified:
   grass/branches/develbranch_6/Makefile
   grass/branches/develbranch_6/include/Make/Grass.make.in
   grass/branches/develbranch_6/tools/
   grass/branches/develbranch_6/tools/Makefile
Log:
fix compilation: backport g.echo.c from trunk
    (merge r53570 & r53571 from relbr64)


Modified: grass/branches/develbranch_6/Makefile
===================================================================
--- grass/branches/develbranch_6/Makefile	2012-10-26 21:03:32 UTC (rev 53572)
+++ grass/branches/develbranch_6/Makefile	2012-10-26 21:11:05 UTC (rev 53573)
@@ -30,6 +30,7 @@
 MAKE_DIR_CMD=		mkdir -p -m 755
 
 SUBDIRS = \
+	tools \
 	lib \
 	db \
 	display \
@@ -43,7 +44,6 @@
 	raster3d \
 	scripts \
 	sites \
-	tools \
 	vector \
 	visualization \
 	man \

Modified: grass/branches/develbranch_6/include/Make/Grass.make.in
===================================================================
--- grass/branches/develbranch_6/include/Make/Grass.make.in	2012-10-26 21:03:32 UTC (rev 53572)
+++ grass/branches/develbranch_6/include/Make/Grass.make.in	2012-10-26 21:11:05 UTC (rev 53573)
@@ -64,6 +64,7 @@
 DOCSDIR         = $(ARCH_DISTDIR)/docs
 HTMLDIR         = $(ARCH_DISTDIR)/docs/html
 SCRIPTDIR       = $(ARCH_DISTDIR)/scripts
+TOOLSDIR	= $(ARCH_DISTDIR)/tools
 
 FONTDIR         = $(ARCH_DISTDIR)/fonts
 


Property changes on: grass/branches/develbranch_6/tools
___________________________________________________________________
Added: svn:ignore
   + OBJ.*


Modified: grass/branches/develbranch_6/tools/Makefile
===================================================================
--- grass/branches/develbranch_6/tools/Makefile	2012-10-26 21:03:32 UTC (rev 53572)
+++ grass/branches/develbranch_6/tools/Makefile	2012-10-26 21:11:05 UTC (rev 53573)
@@ -4,6 +4,13 @@
 
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 
-default: parsubdirs
+default: parsubdirs $(TOOLSDIR)/g.echo$(EXE)
 
 clean: cleansubdirs
+
+$(TOOLSDIR)/g.echo$(EXE): $(OBJDIR)/g.echo.o
+	$(MAKE) $(TOOLSDIR)
+	$(CC) $(LDFLAGS) $(OBJDIR)/g.echo.o -o $@
+
+$(TOOLSDIR):
+	$(MKDIR) $@

Copied: grass/branches/develbranch_6/tools/g.echo.c (from rev 53570, grass/branches/releasebranch_6_4/tools/g.echo.c)
===================================================================
--- grass/branches/develbranch_6/tools/g.echo.c	                        (rev 0)
+++ grass/branches/develbranch_6/tools/g.echo.c	2012-10-26 21:11:05 UTC (rev 53573)
@@ -0,0 +1,9 @@
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+    if (argc != 2)
+	return 1;
+    fputs(argv[1], stdout);
+    return 0;
+}