[GRASS-SVN] r53240 - in grass/trunk: db display doc general imagery imagery/i.find include/Make lib/gtcltk lib/vector man misc ps raster raster/r.watershed/ram raster/r.watershed/seg raster3d scripts temporal tools tools/timer vector
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Sep 20 00:34:55 PDT 2012
Author: glynn
Date: 2012-09-20 00:34:54 -0700 (Thu, 20 Sep 2012)
New Revision: 53240
Removed:
grass/trunk/include/Make/NoRest.make
grass/trunk/include/Make/Rest.make
Modified:
grass/trunk/db/Makefile
grass/trunk/display/Makefile
grass/trunk/doc/Makefile
grass/trunk/general/Makefile
grass/trunk/imagery/Makefile
grass/trunk/imagery/i.find/Makefile
grass/trunk/include/Make/DB.make
grass/trunk/include/Make/Dir.make
grass/trunk/include/Make/Docs.make
grass/trunk/include/Make/Etc.make
grass/trunk/include/Make/Grass.make
grass/trunk/include/Make/Lib.make
grass/trunk/include/Make/Module.make
grass/trunk/include/Make/Multi.make
grass/trunk/include/Make/Other.make
grass/trunk/include/Make/Rules.make
grass/trunk/include/Make/Script.make
grass/trunk/lib/gtcltk/Makefile
grass/trunk/lib/vector/Makefile
grass/trunk/man/Makefile
grass/trunk/misc/Makefile
grass/trunk/ps/Makefile
grass/trunk/raster/Makefile
grass/trunk/raster/r.watershed/ram/Makefile
grass/trunk/raster/r.watershed/seg/Makefile
grass/trunk/raster3d/Makefile
grass/trunk/scripts/Makefile
grass/trunk/temporal/Makefile
grass/trunk/tools/Makefile
grass/trunk/tools/timer/Makefile
grass/trunk/vector/Makefile
Log:
Revert r52656
Modified: grass/trunk/db/Makefile
===================================================================
--- grass/trunk/db/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/db/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -27,7 +27,3 @@
$(MAKE) -C drivers
$(MAKE) parsubdirs
-restdocs: restdir
-
-restdir: $(MAKE) parsubdirs
-
Modified: grass/trunk/display/Makefile
===================================================================
--- grass/trunk/display/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/display/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -45,7 +45,3 @@
default: htmldir
htmldir: parsubdirs
-
-restdocs: restdir
-
-restdir: parsubdirs
Modified: grass/trunk/doc/Makefile
===================================================================
--- grass/trunk/doc/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/doc/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -6,4 +6,3 @@
default: htmldir
-restdocs: $(MAKE) restdir
Modified: grass/trunk/general/Makefile
===================================================================
--- grass/trunk/general/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/general/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -35,6 +35,3 @@
default: parsubdirs
-restdocs: restdir
-
-restdir: parsubdirs
Modified: grass/trunk/imagery/Makefile
===================================================================
--- grass/trunk/imagery/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/imagery/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -47,7 +47,3 @@
htmldir: parsubdirs
-restdocs: restdir
-
-restdir: parsubdirs
-
Modified: grass/trunk/imagery/i.find/Makefile
===================================================================
--- grass/trunk/imagery/i.find/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/imagery/i.find/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -7,7 +7,6 @@
include $(MODULE_TOPDIR)/include/Make/Etc.make
include $(MODULE_TOPDIR)/include/Make/NoHtml.make
-include $(MODULE_TOPDIR)/include/Make/NoRest.make
default: etc
Modified: grass/trunk/include/Make/DB.make
===================================================================
--- grass/trunk/include/Make/DB.make 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/include/Make/DB.make 2012-09-20 07:34:54 UTC (rev 53240)
@@ -7,16 +7,11 @@
include $(MODULE_TOPDIR)/include/Make/Rules.make
include $(MODULE_TOPDIR)/include/Make/Html.make
include $(MODULE_TOPDIR)/include/Make/Compile.make
-include $(MODULE_TOPDIR)/include/Make/Rest.make
dbmi: $(DBDRIVERDIR)/$(PGM)$(EXE) db_html
db_html: $(HTMLDIR)/grass-$(PGM).html $(MANDIR)/grass-$(PGM).$(MANSECT)
-restdocs: $(DBDRIVERDIR)/$(PGM)$(EXE) db_rest
-
-db_rest: $(RESTDIR)/grass-$(PGM).txt
-
$(DBDRIVERDIR)/$(PGM)$(EXE): $(ARCH_OBJS) $(DEPENDENCIES)
$(call linker)
Modified: grass/trunk/include/Make/Dir.make
===================================================================
--- grass/trunk/include/Make/Dir.make 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/include/Make/Dir.make 2012-09-20 07:34:54 UTC (rev 53240)
@@ -4,7 +4,6 @@
include $(MODULE_TOPDIR)/include/Make/Vars.make
include $(MODULE_TOPDIR)/include/Make/Rules.make
include $(MODULE_TOPDIR)/include/Make/Html.make
-include $(MODULE_TOPDIR)/include/Make/Rest.make
# don't install *.png, *.jpg for directories
# to prevent problems with r.out.png etc
@@ -41,8 +40,6 @@
htmldir: html
-restdir: rest
-
.PHONY: subdirs parsubdirs htmldir $(SUBDIRS)
parsubdirs: $(SUBDIRS)
Modified: grass/trunk/include/Make/Docs.make
===================================================================
--- grass/trunk/include/Make/Docs.make 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/include/Make/Docs.make 2012-09-20 07:34:54 UTC (rev 53240)
@@ -102,23 +102,5 @@
fi
sh svn2cl ./ChangeLog
-rest_dirs = \
- db \
- general \
- imagery \
- ps \
- raster \
- raster3d \
- scripts \
- temporal \
- vector \
-
-restdocs:
- $(MAKE)
- $(MKDIR) $(RESTDIR)
- for dir in $(rest_dirs) ; do \
- $(MAKE) -C $$dir rest ; \
- done
-
.PHONY: htmldocs-single htmldocs packagehtmldocs pdfdocs cleandocs html2pdfdoc
.PHONY: html2pdfdoccomplete changelog
Modified: grass/trunk/include/Make/Etc.make
===================================================================
--- grass/trunk/include/Make/Etc.make 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/include/Make/Etc.make 2012-09-20 07:34:54 UTC (rev 53240)
@@ -9,9 +9,8 @@
include $(MODULE_TOPDIR)/include/Make/Rules.make
include $(MODULE_TOPDIR)/include/Make/Html.make
include $(MODULE_TOPDIR)/include/Make/Compile.make
-include $(MODULE_TOPDIR)/include/Make/Rest.make
-etc: $(ETC)/$(PGM)$(EXE) html rest
+etc: $(ETC)/$(PGM)$(EXE) html
$(ETC)/$(PGM)$(EXE): $(ARCH_OBJS) $(DEPENDENCIES)
$(call linker)
Modified: grass/trunk/include/Make/Grass.make
===================================================================
--- grass/trunk/include/Make/Grass.make 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/include/Make/Grass.make 2012-09-20 07:34:54 UTC (rev 53240)
@@ -56,7 +56,6 @@
DBDRIVERDIR = $(ARCH_DISTDIR)/driver/db
DOCSDIR = $(ARCH_DISTDIR)/docs
HTMLDIR = $(ARCH_DISTDIR)/docs/html
-RESTDIR = $(ARCH_DISTDIR)/docs/rest
SCRIPTDIR = $(ARCH_DISTDIR)/scripts
MSG_DIR = $(ARCH_DISTDIR)/etc/msgs
MO_DIR = $(ARCH_DISTDIR)/locale
Modified: grass/trunk/include/Make/Lib.make
===================================================================
--- grass/trunk/include/Make/Lib.make 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/include/Make/Lib.make 2012-09-20 07:34:54 UTC (rev 53240)
@@ -8,7 +8,6 @@
include $(MODULE_TOPDIR)/include/Make/Rules.make
include $(MODULE_TOPDIR)/include/Make/Html.make
include $(MODULE_TOPDIR)/include/Make/Compile.make
-include $(MODULE_TOPDIR)/include/Make/Rest.make
ifneq ($(LIB),)
LIB_NAME := $($(LIB)_LIBNAME)
@@ -25,4 +24,3 @@
lib: $(GRASS_LIBRARY_TYPE)
if [ "$(PGM)" != "" -a -f "$(PGM)".html ] ; then $(MAKE) html ; fi
- if [ "$(PGM)" != "" -a -f "$(PGM)".html ] ; then $(MAKE) rest ; fi
Modified: grass/trunk/include/Make/Module.make
===================================================================
--- grass/trunk/include/Make/Module.make 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/include/Make/Module.make 2012-09-20 07:34:54 UTC (rev 53240)
@@ -9,12 +9,9 @@
include $(MODULE_TOPDIR)/include/Make/Rules.make
include $(MODULE_TOPDIR)/include/Make/Html.make
include $(MODULE_TOPDIR)/include/Make/Compile.make
-include $(MODULE_TOPDIR)/include/Make/Rest.make
-cmd: $(BIN)/$(PGM)$(EXE) html restdocs
+cmd: $(BIN)/$(PGM)$(EXE) html
-restdocs: $(BIN)/$(PGM)$(EXE) rest
-
$(BIN)/$(PGM)$(EXE): $(ARCH_OBJS) $(DEPENDENCIES)
$(call linker)
Modified: grass/trunk/include/Make/Multi.make
===================================================================
--- grass/trunk/include/Make/Multi.make 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/include/Make/Multi.make 2012-09-20 07:34:54 UTC (rev 53240)
@@ -5,7 +5,6 @@
include $(MODULE_TOPDIR)/include/Make/Rules.make
include $(MODULE_TOPDIR)/include/Make/Html.make
include $(MODULE_TOPDIR)/include/Make/Compile.make
-include $(MODULE_TOPDIR)/include/Make/Rest.make
PROGFILES = $(patsubst %,$(BIN)/%$(EXE),$(PROGRAMS))
HTMLFILES = $(patsubst %,$(HTMLDIR)/%.html,$(PROGRAMS))
Deleted: grass/trunk/include/Make/NoRest.make
===================================================================
--- grass/trunk/include/Make/NoRest.make 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/include/Make/NoRest.make 2012-09-20 07:34:54 UTC (rev 53240)
@@ -1,3 +0,0 @@
-
-$(RESTDIR)/$(PGM).txt:
- @echo no REST documentation available
Modified: grass/trunk/include/Make/Other.make
===================================================================
--- grass/trunk/include/Make/Other.make 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/include/Make/Other.make 2012-09-20 07:34:54 UTC (rev 53240)
@@ -1,5 +1,4 @@
include $(MODULE_TOPDIR)/include/Make/Vars.make
include $(MODULE_TOPDIR)/include/Make/Rules.make
include $(MODULE_TOPDIR)/include/Make/Html.make
-include $(MODULE_TOPDIR)/include/Make/Rest.make
Deleted: grass/trunk/include/Make/Rest.make
===================================================================
--- grass/trunk/include/Make/Rest.make 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/include/Make/Rest.make 2012-09-20 07:34:54 UTC (rev 53240)
@@ -1,38 +0,0 @@
-
-# generic rest rules for all commands
-
-ifdef CROSS_COMPILING
-
-rest:
-
-else
-
-#check for program
-checkpandoc:
- @(type pandoc > /dev/null || (echo "ERROR: Install 'pandoc' software first (get from http://johnmacfarlane.net/pandoc/)" && exit 1))
-
-restdesc = $(call run_grass,$(1) --rest-description < /dev/null > $(2)) || exit 0
-
-IMGSRC := $(wildcard *.png) $(wildcard *.jpg)
-IMGDST := $(patsubst %,$(RESTDIR)/%,$(IMGSRC))
-
-$(RESTDIR)/%.txt: %.html %.tmp.txt $(HTMLSRC) $(IMGDST) | $(RESTDIR)
- $(PYTHON) $(GISBASE)/tools/mkrest.py $* $(GRASS_VERSION_DATE) > $@;
-ifneq ($(strip $(IMGDST)),)
-.SECONDARY: $(IMGDST)
-endif
-
-$(RESTDIR)/%.png: %.png | $(RESTDIR)
- $(INSTALL_DATA) $< $@
-
-$(RESTDIR)/%.jpg: %.jpg | $(RESTDIR)
- $(INSTALL_DATA) $< $@
-
-%.tmp.txt: $(HTMLSRC)
- if [ "$(HTMLSRC)" != "" ] ; then $(call restdesc,$<,$@) ; fi
-
-rest: $(RESTDIR)/$(PGM).txt # checkpandoc
-
-endif
-
-.PHONY: rest
Modified: grass/trunk/include/Make/Rules.make
===================================================================
--- grass/trunk/include/Make/Rules.make 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/include/Make/Rules.make 2012-09-20 07:34:54 UTC (rev 53240)
@@ -6,7 +6,7 @@
ARCH_DIRS = $(ARCH_DISTDIR) $(ARCH_BINDIR) $(ARCH_INCDIR) $(ARCH_LIBDIR) \
$(BIN) $(ETC) \
$(DRIVERDIR) $(DBDRIVERDIR) $(FONTDIR) $(DOCSDIR) $(HTMLDIR) \
- $(MANBASEDIR) $(MANDIR) $(TOOLSDIR) $(RESTDIR)
+ $(MANBASEDIR) $(MANDIR) $(TOOLSDIR)
pre: | $(ARCH_DIRS)
Modified: grass/trunk/include/Make/Script.make
===================================================================
--- grass/trunk/include/Make/Script.make 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/include/Make/Script.make 2012-09-20 07:34:54 UTC (rev 53240)
@@ -12,9 +12,8 @@
include $(MODULE_TOPDIR)/include/Make/Rules.make
include $(MODULE_TOPDIR)/include/Make/Html.make
include $(MODULE_TOPDIR)/include/Make/ScriptRules.make
-include $(MODULE_TOPDIR)/include/Make/Rest.make
-SCRIPT_ACTIONS = $(SCRIPT) html scriptstrings rest
+SCRIPT_ACTIONS = $(SCRIPT) html scriptstrings
script: $(SCRIPT_ACTIONS)
@@ -23,7 +22,6 @@
install:
$(INSTALL) $(SCRIPT) $(INST_DIR)/scripts/
$(INSTALL_DATA) $(HTMLDIR)/$(PGM).html $(INST_DIR)/docs/html/
- $(INSTALL_DATA) $(RESTDIR)/$(PGM).txt $(INST_DIR)/docs/rest/
$(INSTALL_DATA) $(ARCH_DISTDIR)/docs/man/man1/$(PGM).1 $(INST_DIR)/docs/man/man1/
if [ -d "$(ETC)/$(PGM)" ] ; then \
cp -rL $(ETC)/$(PGM) $(INST_DIR)/etc/ ; \
Modified: grass/trunk/lib/gtcltk/Makefile
===================================================================
--- grass/trunk/lib/gtcltk/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/lib/gtcltk/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -3,7 +3,6 @@
PGM=grocat
include $(MODULE_TOPDIR)/include/Make/Etc.make
include $(MODULE_TOPDIR)/include/Make/NoHtml.make
-include $(MODULE_TOPDIR)/include/Make/NoRest.make
TCLSRC := $(wildcard *.tcl)
TCLDST := $(patsubst %.tcl,$(ETC)/gtcltk/%.tcl,$(TCLSRC))
Modified: grass/trunk/lib/vector/Makefile
===================================================================
--- grass/trunk/lib/vector/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/lib/vector/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -18,10 +18,6 @@
htmldir: parsubdirs
-restdocs: restdir
-
-restdir: parsubdirs
-
diglib: rtree
Vlib: rtree dglib diglib
Modified: grass/trunk/man/Makefile
===================================================================
--- grass/trunk/man/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/man/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -11,16 +11,6 @@
$(HTMLDIR)/nviz/grassdocs.css \
$(HTMLDIR)/nviz/grass_logo.png
-DSTFILES_REST := \
- $(RESTDIR)/grassdocs.css \
- $(RESTDIR)/grass_logo.png \
- $(RESTDIR)/grass_icon.png \
- $(RESTDIR)/nviz/grassdocs.css \
- $(RESTDIR)/nviz/grass_logo.png \
- $(RESTDIR)/conf.py \
- $(RESTDIR)/make.bat \
- $(RESTDIR)/Makefile \
-
categories = \
d:display \
db:database \
@@ -39,23 +29,14 @@
INDICES := $(patsubst %,$(HTMLDIR)/%.html,$(IDXSRC))
-INDICES_REST := $(patsubst %,$(RESTDIR)/%.txt,$(IDXSRC))
-
ALL_HTML := $(wildcard $(HTMLDIR)/*.*.html)
-ALL_REST := $(wildcard $(RESTDIR)/*.*.txt)
-
default: $(DSTFILES)
@echo "Generating HTML manual pages index (help system)..."
$(MAKE) $(INDICES)
$(call build,check)
$(MAKE) manpages
- GISBASE="$(RUN_GISBASE)" ARCH="$(ARCH)" ARCH_DISTDIR="$(ARCH_DISTDIR)" $(PYTHON) ./build_topics.py $(HTMLDIR)
- $(MAKE) restdocs
-restdocs: $(DSTFILES_REST)
- $(MAKE) $(INDICES_REST)
-
# This must be a separate target so that evaluation of $(MANPAGES)
# is delayed until the indices have been generated
manpages:
@@ -67,33 +48,18 @@
GISBASE="$(RUN_GISBASE)" ARCH="$(ARCH)" ARCH_DISTDIR="$(ARCH_DISTDIR)" $(PYTHON) ./build_$(1).py $(2)
endef
-define build_rest
-GISBASE="$(RUN_GISBASE)" ARCH="$(ARCH)" ARCH_DISTDIR="$(ARCH_DISTDIR)" $(PYTHON) ./build_$(1)_rest.py $(2)
-endef
-
$(HTMLDIR)/full_index.html: $(ALL_HTML) build_full_index.py build_html.py
$(call build,full_index)
touch $@
-$(RESTDIR)/full_index.txt: $(ALL_REST) build_full_index_rest.py build_rest.py
- $(call build_rest,full_index)
- touch $@
-
$(HTMLDIR)/index.html: build_index.py build_html.py
$(call build,index)
touch $@
-$(RESTDIR)/index.txt: build_index_rest.py build_rest.py
- $(call build_rest,index)
- touch $@
-
define category_rule
$$(HTMLDIR)/$(2).html: $$(wildcard $$(HTMLDIR)/$(1).*.html) build_class.py build_html.py
$$(call build,class,$(1) $(2))
touch $$@
-$$(RESTDIR)/$(2).txt: $$(wildcard $$(RESTDIR)/$(1).*.txt) build_class_rest.py build_rest.py
- $$(call build_rest,class,$(1) $(2))
- touch $$@
endef
$(foreach cat,$(categories),$(eval $(call category_rule,$(firstword $(subst :, ,$(cat))),$(lastword $(subst :, ,$(cat))))))
@@ -116,30 +82,3 @@
$(HTMLDIR)/nviz:
$(MKDIR) $@
-$(RESTDIR)/grassdocs.css: grassdocs.css
- $(INSTALL_DATA) $< $@
-
-$(RESTDIR)/nviz/grassdocs.css: grassdocs.css | $(RESTDIR)/nviz
- $(INSTALL_DATA) $< $@
-
-$(RESTDIR)/grass_logo.png: grass_logo.png
- $(INSTALL_DATA) $< $@
-
-$(RESTDIR)/nviz/grass_logo.png: grass_logo.png | $(RESTDIR)/nviz
- $(INSTALL_DATA) $< $@
-
-$(RESTDIR)/grass_icon.png: grass_icon.png
- $(INSTALL_DATA) $< $@
-
-$(RESTDIR)/conf.py: sphinx/conf.py
- $(INSTALL_DATA) $< $@
-
-$(RESTDIR)/make.bat: sphinx/make.bat
- $(INSTALL_DATA) $< $@
-
-$(RESTDIR)/Makefile: sphinx/Makefile
- $(INSTALL_DATA) $< $@
-
-$(RESTDIR)/nviz:
- $(MKDIR) $@
-
Modified: grass/trunk/misc/Makefile
===================================================================
--- grass/trunk/misc/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/misc/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -11,6 +11,3 @@
default: parsubdirs
-restdocs: restdir
-
-restdir: parsubdirs
Modified: grass/trunk/ps/Makefile
===================================================================
--- grass/trunk/ps/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/ps/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -8,6 +8,4 @@
default: parsubdirs
-restdocs: restdir
-restdir: parsubdirs
Modified: grass/trunk/raster/Makefile
===================================================================
--- grass/trunk/raster/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/raster/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -146,13 +146,3 @@
$(HTMLDIR)/r.out.png:
# no-op - override Html.make rule for .png image files
-
-restdocs: restdir
-
-restdir: parsubdirs
- $(RESTDIR)/r.in.png:
- # no-op - override Html.make rule for .png image files
-
- $(RESTDIR)/r.out.png:
- # no-op - override Html.make rule for .png image files
-
Modified: grass/trunk/raster/r.watershed/ram/Makefile
===================================================================
--- grass/trunk/raster/r.watershed/ram/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/raster/r.watershed/ram/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -8,7 +8,6 @@
include $(MODULE_TOPDIR)/include/Make/Etc.make
include $(MODULE_TOPDIR)/include/Make/NoHtml.make
-include $(MODULE_TOPDIR)/include/Make/NoRest.make
default: $(DIR) etc
Modified: grass/trunk/raster/r.watershed/seg/Makefile
===================================================================
--- grass/trunk/raster/r.watershed/seg/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/raster/r.watershed/seg/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -8,7 +8,6 @@
include $(MODULE_TOPDIR)/include/Make/Etc.make
include $(MODULE_TOPDIR)/include/Make/NoHtml.make
-include $(MODULE_TOPDIR)/include/Make/NoRest.make
default: $(DIR) etc
Modified: grass/trunk/raster3d/Makefile
===================================================================
--- grass/trunk/raster3d/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/raster3d/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -27,6 +27,3 @@
htmldir: parsubdirs
-restdocs: restdir
-
-restdir: parsubdirs
Modified: grass/trunk/scripts/Makefile
===================================================================
--- grass/trunk/scripts/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/scripts/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -79,6 +79,3 @@
default: parsubdirs
-restdocs: restdir
-
-restdir: parsubdirs
Modified: grass/trunk/temporal/Makefile
===================================================================
--- grass/trunk/temporal/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/temporal/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -43,6 +43,3 @@
htmldir: parsubdirs
-restdocs: restdir
-
-restdir: parsubdirs
Modified: grass/trunk/tools/Makefile
===================================================================
--- grass/trunk/tools/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/tools/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -5,13 +5,10 @@
include $(MODULE_TOPDIR)/include/Make/Dir.make
include $(MODULE_TOPDIR)/include/Make/Compile.make
-default: parsubdirs $(TOOLSDIR)/mkhtml.py $(TOOLSDIR)/mkrest.py $(TOOLSDIR)/g.echo$(EXE)
+default: parsubdirs $(TOOLSDIR)/mkhtml.py $(TOOLSDIR)/g.echo$(EXE)
$(TOOLSDIR)/mkhtml.py: mkhtml.py
$(INSTALL) $< $@
-$(TOOLSDIR)/mkrest.py: mkrest.py
- $(INSTALL) $< $@
-
$(TOOLSDIR)/g.echo$(EXE): $(OBJDIR)/g.echo.o
$(call linker_base,$(LINK),$(LDFLAGS) $(EXTRA_LDFLAGS),$(MANIFEST_OBJ))
Modified: grass/trunk/tools/timer/Makefile
===================================================================
--- grass/trunk/tools/timer/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/tools/timer/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -5,7 +5,6 @@
include $(MODULE_TOPDIR)/include/Make/Etc.make
include $(MODULE_TOPDIR)/include/Make/NoHtml.make
-include $(MODULE_TOPDIR)/include/Make/NoRest.make
FMODE_OBJ =
Modified: grass/trunk/vector/Makefile
===================================================================
--- grass/trunk/vector/Makefile 2012-09-20 06:48:25 UTC (rev 53239)
+++ grass/trunk/vector/Makefile 2012-09-20 07:34:54 UTC (rev 53240)
@@ -106,7 +106,3 @@
htmldir: parsubdirs
-restdocs: restdir
-
-restdir: parsubdirs
-
More information about the grass-commit
mailing list