From a14bcd9028c502f21023a9c3d27354f030e82795 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 21 Nov 2013 09:39:06 +0200
Subject: Add support for not cleaning generated files (cli, doc)

---
 build/bootstrap.make          | 8 +++-----
 doc/cxx/makefile              | 4 ++--
 doc/cxx/parser/guide/makefile | 6 ++++--
 doc/cxx/parser/makefile       | 4 ++--
 doc/cxx/tree/guide/makefile   | 6 ++++--
 doc/cxx/tree/makefile         | 4 ++--
 doc/cxx/tree/manual/makefile  | 6 ++++--
 doc/makefile                  | 6 ++++--
 makefile                      | 6 ++----
 xsd/makefile                  | 7 +++++--
 10 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/build/bootstrap.make b/build/bootstrap.make
index 1a1c160..f2bf49e 100644
--- a/build/bootstrap.make
+++ b/build/bootstrap.make
@@ -36,19 +36,17 @@ $(call include,$(bld_root)/cxx/configuration.make)
         $(out_base)/.dist          \
         $(out_base)/.dist-win      \
         $(out_base)/.dist-common   \
-        $(out_base)/.clean         \
-        $(out_base)/.cleandoc
+        $(out_base)/.clean
 
 ifdef %interactive%
 
-.PHONY: test install dist dist-win clean cleandoc
+.PHONY: test install dist dist-win clean
 
 test: $(out_base)/.test
 install: $(out_base)/.install
 dist: $(out_base)/.dist
 dist-win: $(out_base)/.dist-win
 clean: $(out_base)/.clean
-cleandoc: $(out_base)/.cleandoc
 
 endif
 
@@ -82,7 +80,7 @@ endif
 
 # Don't include dependency info for certain targets.
 #
-ifneq ($(filter $(MAKECMDGOALS),clean cleandoc disfigure),)
+ifneq ($(filter $(MAKECMDGOALS),clean disfigure),)
 include-dep =
 endif
 
diff --git a/doc/cxx/makefile b/doc/cxx/makefile
index 6f54ce6..248a667 100644
--- a/doc/cxx/makefile
+++ b/doc/cxx/makefile
@@ -11,12 +11,12 @@ default  := $(out_base)/
 install  := $(out_base)/.install
 dist     := $(out_base)/.dist
 dist-win := $(out_base)/.dist-win
-cleandoc := $(out_base)/.cleandoc
+clean    := $(out_base)/.clean
 
 $(default): $(addprefix $(out_base)/,$(addsuffix /,$(docs)))
 $(install): $(addprefix $(out_base)/,$(addsuffix /.install,$(docs)))
 $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(docs)))
 $(dist-win): $(addprefix $(out_base)/,$(addsuffix /.dist-win,$(docs)))
-$(cleandoc): $(addprefix $(out_base)/,$(addsuffix /.cleandoc,$(docs)))
+$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(docs)))
 
 $(foreach m,$(docs),$(call import,$(src_base)/$m/makefile))
diff --git a/doc/cxx/parser/guide/makefile b/doc/cxx/parser/guide/makefile
index 579cf79..b11d57b 100644
--- a/doc/cxx/parser/guide/makefile
+++ b/doc/cxx/parser/guide/makefile
@@ -9,7 +9,7 @@ default  := $(out_base)/
 install  := $(out_base)/.install
 dist     := $(out_base)/.dist
 dist-win := $(out_base)/.dist-win
-cleandoc := $(out_base)/.cleandoc
+clean    := $(out_base)/.clean
 
 # Build.
 #
@@ -46,9 +46,11 @@ $(dist-win): $(dist)
 
 # Clean
 #
-$(cleandoc):
+$(clean):
+ifneq ($(xsd_clean_gen),n)
 	$(call message,rm $$1,rm -f $$1,$(out_base)/cxx-parser-guide.ps)
 	$(call message,rm $$1,rm -f $$1,$(out_base)/cxx-parser-guide.pdf)
+endif
 
 # How to.
 #
diff --git a/doc/cxx/parser/makefile b/doc/cxx/parser/makefile
index 2ede66e..ce856f3 100644
--- a/doc/cxx/parser/makefile
+++ b/doc/cxx/parser/makefile
@@ -11,12 +11,12 @@ default  := $(out_base)/
 install  := $(out_base)/.install
 dist     := $(out_base)/.dist
 dist-win := $(out_base)/.dist-win
-cleandoc := $(out_base)/.cleandoc
+clean    := $(out_base)/.clean
 
 $(default): $(addprefix $(out_base)/,$(addsuffix /,$(docs)))
 $(install): $(addprefix $(out_base)/,$(addsuffix /.install,$(docs)))
 $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(docs)))
 $(dist-win): $(addprefix $(out_base)/,$(addsuffix /.dist-win,$(docs)))
-$(cleandoc): $(addprefix $(out_base)/,$(addsuffix /.cleandoc,$(docs)))
+$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(docs)))
 
 $(foreach m,$(docs),$(call import,$(src_base)/$m/makefile))
diff --git a/doc/cxx/tree/guide/makefile b/doc/cxx/tree/guide/makefile
index 6d91a4d..f470538 100644
--- a/doc/cxx/tree/guide/makefile
+++ b/doc/cxx/tree/guide/makefile
@@ -9,7 +9,7 @@ default  := $(out_base)/
 install  := $(out_base)/.install
 dist     := $(out_base)/.dist
 dist-win := $(out_base)/.dist-win
-cleandoc := $(out_base)/.cleandoc
+clean    := $(out_base)/.clean
 
 # Build.
 #
@@ -44,9 +44,11 @@ $(dist-win): $(dist)
 
 # Clean
 #
-$(cleandoc):
+$(clean):
+ifneq ($(xsd_clean_gen),n)
 	$(call message,rm $$1,rm -f $$1,$(out_base)/cxx-tree-guide.ps)
 	$(call message,rm $$1,rm -f $$1,$(out_base)/cxx-tree-guide.pdf)
+endif
 
 # How to.
 #
diff --git a/doc/cxx/tree/makefile b/doc/cxx/tree/makefile
index 7aaed95..63cd407 100644
--- a/doc/cxx/tree/makefile
+++ b/doc/cxx/tree/makefile
@@ -11,7 +11,7 @@ default  := $(out_base)/
 install  := $(out_base)/.install
 dist     := $(out_base)/.dist
 dist-win := $(out_base)/.dist-win
-cleandoc := $(out_base)/.cleandoc
+clean    := $(out_base)/.clean
 
 # Build.
 #
@@ -35,7 +35,7 @@ $(dist-win): $(dist-common) $(addprefix $(out_base)/,$(addsuffix /.dist-win,$(do
 
 # Clean.
 #
-$(cleandoc): $(addprefix $(out_base)/,$(addsuffix /.cleandoc,$(docs)))
+$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(docs)))
 
 $(call include,$(bld_root)/install.make)
 
diff --git a/doc/cxx/tree/manual/makefile b/doc/cxx/tree/manual/makefile
index 4ea9291..dfa7be3 100644
--- a/doc/cxx/tree/manual/makefile
+++ b/doc/cxx/tree/manual/makefile
@@ -9,7 +9,7 @@ default  := $(out_base)/
 install  := $(out_base)/.install
 dist     := $(out_base)/.dist
 dist-win := $(out_base)/.dist-win
-cleandoc := $(out_base)/.cleandoc
+clean    := $(out_base)/.clean
 
 # Build.
 #
@@ -44,9 +44,11 @@ $(dist-win): $(dist)
 
 # Clean
 #
-$(cleandoc):
+$(clean):
+ifneq ($(xsd_clean_gen),n)
 	$(call message,rm $$1,rm -f $$1,$(out_base)/cxx-tree-manual.ps)
 	$(call message,rm $$1,rm -f $$1,$(out_base)/cxx-tree-manual.pdf)
+endif
 
 # How to.
 #
diff --git a/doc/makefile b/doc/makefile
index a99d020..e1bdc5f 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -9,7 +9,7 @@ default  := $(out_base)/
 install  := $(out_base)/.install
 dist     := $(out_base)/.dist
 dist-win := $(out_base)/.dist-win
-cleandoc := $(out_base)/.cleandoc
+clean    := $(out_base)/.clean
 
 # Import.
 #
@@ -123,9 +123,11 @@ $(dist-win): $(dist-common) $(out_base)/cxx/.dist-win
 
 # Clean.
 #
-$(cleandoc): $(src_base)/cxx/.cleandoc
+$(clean): $(src_base)/cxx/.clean
+ifneq ($(xsd_clean_gen),n)
 	$(call message,rm $$1,rm -f $$1,$(out_base)/xsd.1)
 	$(call message,rm $$1,rm -f $$1,$(out_base)/xsd.xhtml)
+endif
 
 # Generated .gitignore.
 #
diff --git a/makefile b/makefile
index 56e414e..b8b165f 100644
--- a/makefile
+++ b/makefile
@@ -11,7 +11,6 @@ install  := $(out_base)/.install
 dist     := $(out_base)/.dist
 dist-win := $(out_base)/.dist-win
 clean    := $(out_base)/.clean
-cleandoc := $(out_base)/.cleandoc
 
 $(default): $(out_base)/xsd/      \
             $(out_base)/tests/    \
@@ -83,9 +82,8 @@ $(dist-win): $(out_base)/xsd/.dist-win           \
 #
 $(clean): $(out_base)/xsd/.clean      \
           $(out_base)/tests/.clean    \
-          $(out_base)/examples/.clean
-
-$(cleandoc): $(out_base)/doc/.cleandoc
+          $(out_base)/examples/.clean \
+          $(out_base)/doc/.clean
 
 $(call include,$(bld_root)/install.make)
 
diff --git a/xsd/makefile b/xsd/makefile
index 8587458..5e5dedb 100644
--- a/xsd/makefile
+++ b/xsd/makefile
@@ -164,8 +164,11 @@ $(dist-win): $(xsd)
 $(clean):                            \
   $(xsd).o.clean                     \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addprefix $(out_base)/,$(cli_tun:.cli=.cxx.cli.clean))
+  $(addsuffix .cxx.clean,$(cxx_od))
+
+ifneq ($(xsd_clean_gen),n)
+$(clean): $(addprefix $(out_base)/,$(cli_tun:.cli=.cxx.cli.clean))
+endif
 
 # Generated .gitignore.
 #
-- 
cgit v1.1