From 8b22f52b002668270af8706fca039b0c39a1680e Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 21 Nov 2013 09:38:29 +0200
Subject: Add support for not cleaning generated files (m4)

---
 build/bootstrap.make  | 6 +++++-
 xsd-frontend/makefile | 7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/build/bootstrap.make b/build/bootstrap.make
index 9aa08f2..162d45b 100644
--- a/build/bootstrap.make
+++ b/build/bootstrap.make
@@ -16,6 +16,10 @@ ifeq ($(patsubst %build/bootstrap.make,,$(lastword $(MAKEFILE_LIST))),)
 include $(build)/bootstrap.make
 endif
 
+# Configuration (optional; only used in the +dep packages).
+#
+$(call -include,$(dcf_root)/configuration-dynamic.make)
+
 # Aliases
 #
 .PHONY: $(out_base)/       \
@@ -41,6 +45,6 @@ define include-dep
 $(call -include,$1)
 endef
 
-ifneq ($(filter $(MAKECMDGOALS),clean cleandoc disfigure),)
+ifneq ($(filter $(MAKECMDGOALS),clean disfigure),)
 include-dep =
 endif
diff --git a/xsd-frontend/makefile b/xsd-frontend/makefile
index 3f62bf0..85003da 100644
--- a/xsd-frontend/makefile
+++ b/xsd-frontend/makefile
@@ -93,8 +93,11 @@ $(out_base)/: $(xsd_frontend.l)
 $(clean): $(xsd_frontend.l).o.clean     \
   $(xsd_frontend.l.cpp-options).clean   \
   $(addsuffix .cxx.clean,$(cxx_obj))    \
-  $(addsuffix .cxx.clean,$(cxx_od))     \
-  $(addsuffix .m4.clean,$(m4_cxx))
+  $(addsuffix .cxx.clean,$(cxx_od))
+
+ifneq ($(libxsd_frontend_clean_gen),n)
+$(clean): $(addsuffix .m4.clean,$(m4_cxx))
+endif
 
 # Generated .gitignore.
 #
-- 
cgit v1.1