Add support for not cleaning generated files (cli, doc)

8 files changed, 28 insertions, 22 deletions

diff --git a/build/bootstrap.make b/build/bootstrap.make
index 6b53ebe..43723fd 100644
--- a/build/bootstrap.make
+++ b/build/bootstrap.make
@@ -29,21 +29,19 @@ $(call include,$(scf_root)/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
 
-ifneq ($(filter $(.DEFAULT_GOAL),test install dist dist-win clean cleandoc),)
+ifneq ($(filter $(.DEFAULT_GOAL),test install dist dist-win clean),)
 .DEFAULT_GOAL :=
 endif
 
@@ -65,7 +63,7 @@ define include-dep
 $(call -include,$1)
 endef
 
-ifneq ($(filter $(MAKECMDGOALS),clean cleandoc disfigure),)
+ifneq ($(filter $(MAKECMDGOALS),clean disfigure),)
 include-dep =
 endif
 
diff --git a/doc/cxx/hybrid/guide/makefile b/doc/cxx/hybrid/guide/makefile
index 296a745..0f83756 100644
--- a/doc/cxx/hybrid/guide/makefile
+++ b/doc/cxx/hybrid/guide/makefile
@@ -8,7 +8,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
 default  := $(out_base)/
 dist     := $(out_base)/.dist
 dist-win := $(out_base)/.dist-win
-cleandoc := $(out_base)/.cleandoc
+clean    := $(out_base)/.clean
 
 # Build.
 #
@@ -39,9 +39,11 @@ $(dist-win): $(dist)
 
 # Clean.
 #
-$(cleandoc):
+$(clean):
+ifneq ($(xsde_clean_gen),n)
 	$(call message,rm $$1,rm -f $$1,$(out_base)/cxx-hybrid-e-guide.ps)
 	$(call message,rm $$1,rm -f $$1,$(out_base)/cxx-hybrid-e-guide.pdf)
+endif
 
 # How to.
 #
diff --git a/doc/cxx/makefile b/doc/cxx/makefile
index 4704c60..200e46b 100644
--- a/doc/cxx/makefile
+++ b/doc/cxx/makefile
@@ -10,11 +10,11 @@ mappings := hybrid/guide parser/guide serializer/guide
 default  := $(out_base)/
 dist     := $(out_base)/.dist
 dist-win := $(out_base)/.dist-win
-cleandoc := $(out_base)/.cleandoc
+clean    := $(out_base)/.clean
 
 $(default): $(addprefix $(out_base)/,$(addsuffix /,$(mappings)))
 $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(mappings)))
 $(dist-win): $(addprefix $(out_base)/,$(addsuffix /.dist-win,$(mappings)))
-$(cleandoc): $(addprefix $(out_base)/,$(addsuffix /.cleandoc,$(mappings)))
+$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(mappings)))
 
 $(foreach m,$(mappings),$(call import,$(src_base)/$m/makefile))
diff --git a/doc/cxx/parser/guide/makefile b/doc/cxx/parser/guide/makefile
index 48c37d9..6e8d8ab 100644
--- a/doc/cxx/parser/guide/makefile
+++ b/doc/cxx/parser/guide/makefile
@@ -8,7 +8,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
 default  := $(out_base)/
 dist     := $(out_base)/.dist
 dist-win := $(out_base)/.dist-win
-cleandoc := $(out_base)/.cleandoc
+clean    := $(out_base)/.clean
 
 # Build.
 #
@@ -39,9 +39,11 @@ $(dist-win): $(dist)
 
 # Clean
 #
-$(cleandoc):
+$(clean):
+ifneq ($(xsde_clean_gen),n)
 	$(call message,rm $$1,rm -f $$1,$(out_base)/cxx-parser-e-guide.ps)
 	$(call message,rm $$1,rm -f $$1,$(out_base)/cxx-parser-e-guide.pdf)
+endif
 
 # How to.
 #
diff --git a/doc/cxx/serializer/guide/makefile b/doc/cxx/serializer/guide/makefile
index 7502a53..a4a47b5 100644
--- a/doc/cxx/serializer/guide/makefile
+++ b/doc/cxx/serializer/guide/makefile
@@ -8,7 +8,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
 default  := $(out_base)/
 dist     := $(out_base)/.dist
 dist-win := $(out_base)/.dist-win
-cleandoc := $(out_base)/.cleandoc
+clean    := $(out_base)/.clean
 
 # Build.
 #
@@ -39,9 +39,11 @@ $(dist-win): $(dist)
 
 # Clean.
 #
-$(cleandoc):
+$(clean):
+ifneq ($(xsde_clean_gen),n)
 	$(call message,rm $$1,rm -f $$1,$(out_base)/cxx-serializer-e-guide.ps)
 	$(call message,rm $$1,rm -f $$1,$(out_base)/cxx-serializer-e-guide.pdf)
+endif
 
 # How to.
 #
diff --git a/doc/makefile b/doc/makefile
index ee3c5bd..2a126c6 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -9,7 +9,7 @@ default  := $(out_base)/
 dist     := $(out_base)/.dist
 dist-win := $(out_base)/.dist-win
 install  := $(out_base)/.install
-cleandoc := $(out_base)/.cleandoc
+clean    := $(out_base)/.clean
 
 # Import.
 #
@@ -139,9 +139,11 @@ $(install): $(out_base)/xsde.xhtml \
 
 # Clean.
 #
-$(cleandoc): $(src_base)/cxx/.cleandoc
+$(clean): $(src_base)/cxx/.clean
+ifneq ($(xsde_clean_gen),n)
 	$(call message,rm $$1,rm -f $$1,$(out_base)/xsde.1)
 	$(call message,rm $$1,rm -f $$1,$(out_base)/xsde.xhtml)
+endif
 
 # Generated .gitignore.
 #
diff --git a/makefile b/makefile
index b69e892..337dd01 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
 
 
 # Build.
@@ -87,9 +86,8 @@ $(dist-win): $(dist-common)                      \
 $(clean): $(out_base)/xsde/.clean      \
           $(out_base)/libxsde/.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/xsde/makefile b/xsde/makefile
index 9216333..a7fa6d2 100644
--- a/xsde/makefile
+++ b/xsde/makefile
@@ -195,9 +195,11 @@ $(install): $(xsde)
 $(clean):                            \
   $(xsde).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 ($(xsde_clean_gen),n)
+$(clean): $(addprefix $(out_base)/,$(cli_tun:.cli=.cxx.cli.clean))
+endif
 
 # Generated .gitignore.
 #