4 files changed, 43 insertions, 13 deletions
diff --git a/dist/examples/cxx/hybrid/binary/cdr/makefile b/dist/examples/cxx/hybrid/binary/cdr/makefile
index 6814623..0f2e44d 100644
--- a/dist/examples/cxx/hybrid/binary/cdr/makefile
+++ b/dist/examples/cxx/hybrid/binary/cdr/makefile
@@ -47,6 +47,13 @@ library-simpl.o: library-simpl.cxx
 --generate-parser --generate-serializer --generate-aggregate \
 --generate-insertion CDR --generate-extraction CDR $<
 
+
+# Generate.
+#
+.PHONY: gen
+gen: library.hxx
+
+
 # Test.
 #
 .PHONY: test
@@ -55,8 +62,11 @@ test: driver library.xml
 
 # Clean.
 #
-.PHONY: clean
-clean:
+.PHONY: clean cleanobj
+cleanobj:
+	rm -f library-pimpl.o library-pskel.o library-simpl.o library-sskel.o \
+library.o driver.o driver
+
+clean: cleanobj
 	rm -f library-pimpl.?xx library-pskel.?xx library-simpl.?xx \
-library-sskel.?xx library.?xx library-pimpl.o library-pskel.o \
-library-simpl.o library-sskel.o library.o driver.o driver
+library-sskel.?xx library.?xx
diff --git a/dist/examples/cxx/hybrid/binary/custom/makefile b/dist/examples/cxx/hybrid/binary/custom/makefile
index 39ba93c..63a48bf 100644
--- a/dist/examples/cxx/hybrid/binary/custom/makefile
+++ b/dist/examples/cxx/hybrid/binary/custom/makefile
@@ -58,6 +58,13 @@ xml-schema%hxx xml-schema-pskel%hxx xml-schema-sskel%hxx:
 	$(root)/bin/xsde cxx-hybrid $(XSDFLAGS) $(EXTRA_XSDFLAGS) \
 --options-file options $<
 
+
+# Generate.
+#
+.PHONY: gen
+gen: xml-schema.hxx library.hxx
+
+
 # Test.
 #
 .PHONY: test
@@ -66,9 +73,12 @@ test: driver library.xml
 
 # Clean.
 #
-.PHONY: clean
-clean:
+.PHONY: clean cleanobj
+cleanobj:
+	rm -f library-pimpl.o library-pskel.o library-simpl.o library-sskel.o \
+library.o irawstream.o orawstream.o exceptions.o driver.o driver
+
+clean: cleanobj
 	rm -f xml-schema.hxx xml-schema-pskel.hxx xml-schema-sskel.hxx \
 library-pimpl.?xx library-pskel.?xx library-simpl.?xx library-sskel.?xx \
-library.?xx library-pimpl.o library-pskel.o library-simpl.o library-sskel.o \
-library.o irawstream.o orawstream.o exceptions.o driver.o driver
+library.?xx
diff --git a/dist/examples/cxx/hybrid/binary/nmakefile b/dist/examples/cxx/hybrid/binary/nmakefile
index da24750..89db376 100644
--- a/dist/examples/cxx/hybrid/binary/nmakefile
+++ b/dist/examples/cxx/hybrid/binary/nmakefile
@@ -26,6 +26,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/examples/cxx/hybrid/binary/xdr/makefile b/dist/examples/cxx/hybrid/binary/xdr/makefile
index 9967e70..2d926ea 100644
--- a/dist/examples/cxx/hybrid/binary/xdr/makefile
+++ b/dist/examples/cxx/hybrid/binary/xdr/makefile
@@ -45,6 +45,13 @@ library-simpl.o: library-simpl.cxx
 --generate-parser --generate-serializer --generate-aggregate \
 --generate-insertion XDR --generate-extraction XDR $<
 
+
+# Generate.
+#
+.PHONY: gen
+gen: library.hxx
+
+
 # Test.
 #
 .PHONY: test
@@ -53,8 +60,11 @@ test: driver library.xml
 
 # Clean.
 #
-.PHONY: clean
-clean:
+.PHONY: clean cleanobj
+cleanobj:
+	rm -f library-pimpl.o library-pskel.o library-simpl.o library-sskel.o \
+library.o driver.o driver
+
+clean: cleanobj
 	rm -f library-pimpl.?xx library-pskel.?xx library-simpl.?xx \
-library-sskel.?xx library.?xx library-pimpl.o library-pskel.o \
-library-simpl.o library-sskel.o library.o driver.o driver
+library-sskel.?xx library.?xx