[GRASS-SVN] r53570 - in grass/branches/releasebranch_6_4: . include/Make tools
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Oct 26 13:59:51 PDT 2012
Author: martinl
Date: 2012-10-26 13:59:51 -0700 (Fri, 26 Oct 2012)
New Revision: 53570
Added:
grass/branches/releasebranch_6_4/tools/g.echo.c
Modified:
grass/branches/releasebranch_6_4/Makefile
grass/branches/releasebranch_6_4/include/Make/Grass.make.in
grass/branches/releasebranch_6_4/tools/Makefile
Log:
fix compilation: backport g.echo.c from trunk
Modified: grass/branches/releasebranch_6_4/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/Makefile 2012-10-26 20:57:16 UTC (rev 53569)
+++ grass/branches/releasebranch_6_4/Makefile 2012-10-26 20:59:51 UTC (rev 53570)
@@ -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/releasebranch_6_4/include/Make/Grass.make.in
===================================================================
--- grass/branches/releasebranch_6_4/include/Make/Grass.make.in 2012-10-26 20:57:16 UTC (rev 53569)
+++ grass/branches/releasebranch_6_4/include/Make/Grass.make.in 2012-10-26 20:59:51 UTC (rev 53570)
@@ -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
Modified: grass/branches/releasebranch_6_4/tools/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/tools/Makefile 2012-10-26 20:57:16 UTC (rev 53569)
+++ grass/branches/releasebranch_6_4/tools/Makefile 2012-10-26 20:59:51 UTC (rev 53570)
@@ -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/releasebranch_6_4/tools/g.echo.c (from rev 53559, grass/trunk/tools/g.echo.c)
===================================================================
--- grass/branches/releasebranch_6_4/tools/g.echo.c (rev 0)
+++ grass/branches/releasebranch_6_4/tools/g.echo.c 2012-10-26 20:59:51 UTC (rev 53570)
@@ -0,0 +1,9 @@
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+ if (argc != 2)
+ return 1;
+ fputs(argv[1], stdout);
+ return 0;
+}
More information about the grass-commit
mailing list