1 files changed, 40 insertions, 9 deletions
diff --git a/tests/cxx/serializer/makefile b/tests/cxx/serializer/makefile
index dcb27f0..577fb26 100644
--- a/tests/cxx/serializer/makefile
+++ b/tests/cxx/serializer/makefile
@@ -5,11 +5,35 @@
 
 include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
 
-tests := generated-driver generated-impl
+# NOTE: remember to update dist/tests/cxx/serializer/{makefile,nmakefile} if 
+# you change anything here.
+#
+
+all_tests :=     \
+generated-driver \
+generated-impl   \
+all              \
+built-in         \
+choice           \
+error-handling   \
+recursive        \
+reset            \
+restriction      \
+sequence         \
+test-template    \
+wildcard         \
+complex          \
+enumeration      \
+list             \
+union            \
+polymorphism     \
+validation
+
+build_tests := generated-driver generated-impl
 
 ifeq ($(xsde_iostream),y)
 
-tests +=        \
+build_tests +=  \
 all             \
 built-in        \
 choice          \
@@ -22,7 +46,7 @@ test-template   \
 wildcard
 
 ifeq ($(xsde_reuse_style),tiein)
-tests +=        \
+build_tests +=  \
 complex         \
 enumeration     \
 list            \
@@ -31,22 +55,29 @@ endif
 
 ifeq ($(xsde_polymorphic),y)
 ifeq ($(xsde_reuse_style),tiein)
-tests += polymorphism
+build_tests += polymorphism
 endif
 endif
 
 endif # xsde_iostream
 
 ifeq ($(xsde_serializer_validation),y)
-tests += validation
+build_tests += validation
 endif
 
 default   := $(out_base)/
 test      := $(out_base)/.test
+dist      := $(out_base)/.dist
+dist-win  := $(out_base)/.dist-win
 clean     := $(out_base)/.clean
 
-$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests)))
-$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests)))
-$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests)))
+$(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests)))
+$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(build_tests)))
+$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests)))
+$(dist-win): $(addprefix $(out_base)/,$(addsuffix /.dist-win,$(all_tests)))
 
-$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile))
+ifneq ($(filter $(MAKECMDGOALS),dist dist-win),)
+$(foreach t,$(all_tests),$(call import,$(src_base)/$t/makefile))
+else
+$(foreach t,$(build_tests),$(call import,$(src_base)/$t/makefile))
+endif