From 4960bf9dcfa58bb18c90d69351d21223f47604c9 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 21 Oct 2009 08:08:53 +0200
Subject: Add gen and cleanobj targets to libxsde and root makefiles

---
 dist/libxsde/nmakefile      |  2 +-
 dist/libxsde/xsde/makefile  | 12 ++++++++++--
 dist/libxsde/xsde/nmakefile | 10 +++++++++-
 dist/makefile               |  2 +-
 dist/nmakefile              |  5 +----
 5 files changed, 22 insertions(+), 9 deletions(-)

(limited to 'dist')

diff --git a/dist/libxsde/nmakefile b/dist/libxsde/nmakefile
index 9ecb241..aad7031 100644
--- a/dist/libxsde/nmakefile
+++ b/dist/libxsde/nmakefile
@@ -4,6 +4,6 @@ all:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
 
-test clean:
+gen test clean cleanobj:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
diff --git a/dist/libxsde/xsde/makefile b/dist/libxsde/xsde/makefile
index 90f2252..9abff7a 100644
--- a/dist/libxsde/xsde/makefile
+++ b/dist/libxsde/xsde/makefile
@@ -562,6 +562,12 @@ endif
 	@echo $(h)endif                             >>$@
 
 
+# Generated.
+#
+.PHONY: gen
+gen:
+
+
 # Test.
 #
 .PHONY: test
@@ -570,6 +576,8 @@ test: libxsde.a
 
 # Clean.
 #
-.PHONY: clean
-clean:
+.PHONY: clean cleanobj
+cleanobj:
 	rm -f libxsde.a $(obj) config.h
+
+clean: cleanobj
diff --git a/dist/libxsde/xsde/nmakefile b/dist/libxsde/xsde/nmakefile
index 8eac019..dd806f7 100644
--- a/dist/libxsde/xsde/nmakefile
+++ b/dist/libxsde/xsde/nmakefile
@@ -557,6 +557,12 @@ config.h:
 !endif
 	@echo #endif                              >>$@
 
+
+# Generated.
+#
+gen:
+
+
 # Test.
 #
 test: xsde.lib
@@ -566,7 +572,7 @@ test: xsde.lib
 # Nmake that comes with eVC++ 4 cannot handle del $(obj)
 # because the resulting line is too long.
 #
-clean:
+cleanobj:
 	-del xsde.lib config.h
 	-del c\expat\*.obj
 	-del c\genx\*.obj
@@ -585,3 +591,5 @@ clean:
 !else
 	-del cxx\serializer\non-validating\*.obj
 !endif
+
+clean: cleanobj
diff --git a/dist/makefile b/dist/makefile
index 1d06b13..83b9661 100644
--- a/dist/makefile
+++ b/dist/makefile
@@ -1,6 +1,6 @@
 dirs := libxsde examples
 
-ifneq ($(filter $(MAKECMDGOALS),test clean),)
+ifneq ($(filter $(MAKECMDGOALS),gen test clean cleanobj),)
 dirs += tests
 endif
 
diff --git a/dist/nmakefile b/dist/nmakefile
index 0a17809..03dbab7 100644
--- a/dist/nmakefile
+++ b/dist/nmakefile
@@ -4,10 +4,7 @@ all:
 	@for %i in ( $(dirs) ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
 
-test:
+gen test clean cleanobj:
 	@for %i in ( $(dirs) tests ) do \
 @cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
 
-clean:
-	@for %i in ( $(dirs) tests ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
-- 
cgit v1.1