1 files changed, 31 insertions, 16 deletions
diff --git a/tests/cxx/parser/makefile b/tests/cxx/parser/makefile
index 1f749df..8b11959 100644
--- a/tests/cxx/parser/makefile
+++ b/tests/cxx/parser/makefile
@@ -5,19 +5,27 @@
 
 include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
 
-tests := generated-impl duplicate
+# NOTE: remember to update dist/tests/cxx/parser/{makefile,nmakefile} if 
+# you change anything here.
+#
+
+all_tests := generated-impl duplicate built-in recursive test-template \
+union enumeration list polymorphism reset validation error-handling \
+name-clash/inheritance
+
+build_tests := generated-impl duplicate
 
 ifeq ($(xsde_iostream),y)
 ifeq ($(xsde_exceptions),y)
-tests +=      \
-built-in      \
-recursive     \
-test-template \
+build_tests += \
+built-in       \
+recursive      \
+test-template  \
 union
 
 ifeq ($(xsde_reuse_style),tiein)
-tests +=      \
-enumeration   \
+build_tests += \
+enumeration    \
 list
 endif
 
@@ -25,33 +33,40 @@ endif # exceptions
 
 ifeq ($(xsde_polymorphic),y)
 ifeq ($(xsde_reuse_style),tiein)
-tests += polymorphism
+build_tests += polymorphism
 endif
 endif
 
-tests += reset
+build_tests += reset
 
 endif # iostream
 
 
 ifeq ($(xsde_parser_validation),y)
-tests += validation
+build_tests += validation
 
 ifeq ($(xsde_iostream),y)
-tests += error-handling
+build_tests += error-handling
 
 ifeq ($(xsde_exceptions),y)
-tests += name-clash/inheritance
+build_tests += name-clash/inheritance
 endif
 endif
 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