summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2010-06-02 17:21:32 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2010-06-02 17:21:32 +0200
commit62166bfe7031522bd851eb5d7047a19182e24a45 (patch)
tree43926d04513c7dda6dd24b678c9eac27a0eb0d3f
parentd7cb3c62c90aaa3027730e07136fa7df371290c4 (diff)
Add cli options instead of overriding them
-rw-r--r--cli/makefile2
-rw-r--r--examples/file/makefile2
-rw-r--r--tests/ctor/makefile1
-rw-r--r--tests/erase/makefile1
-rw-r--r--tests/file/makefile2
5 files changed, 3 insertions, 5 deletions
diff --git a/cli/makefile b/cli/makefile
index 7183e58..11742de 100644
--- a/cli/makefile
+++ b/cli/makefile
@@ -64,7 +64,7 @@ genf := $(cli_tun:.cli=.hxx) $(cli_tun:.cli=.ixx) $(cli_tun:.cli=.cxx)
gen := $(addprefix $(out_base)/,$(genf))
$(gen): cli := $(out_root)/cli/cli
-$(gen): cli_options := --generate-file-scanner --guard-prefix CLI \
+$(gen): cli_options += --generate-file-scanner --guard-prefix CLI \
--reserved-name stdout
$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
diff --git a/examples/file/makefile b/examples/file/makefile
index ec236dd..64e6ea6 100644
--- a/examples/file/makefile
+++ b/examples/file/makefile
@@ -25,7 +25,7 @@ genf := $(cli:.cli=.hxx) $(cli:.cli=.ixx) $(cli:.cli=.cxx)
gen := $(addprefix $(out_base)/,$(genf))
$(gen): cli := $(out_root)/cli/cli
-$(gen): cli_options := --generate-file-scanner
+$(gen): cli_options += --generate-file-scanner
$(gen): $(out_root)/cli/cli
$(call include-dep,$(dep),$(obj),$(gen))
diff --git a/tests/ctor/makefile b/tests/ctor/makefile
index cd2466e..9d87279 100644
--- a/tests/ctor/makefile
+++ b/tests/ctor/makefile
@@ -27,7 +27,6 @@ gen := $(addprefix $(out_base)/,$(genf))
$(gen): $(out_root)/cli/cli
$(gen): cli := $(out_root)/cli/cli
-$(gen): cli_options :=
$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
diff --git a/tests/erase/makefile b/tests/erase/makefile
index 9f65e59..815cc5b 100644
--- a/tests/erase/makefile
+++ b/tests/erase/makefile
@@ -27,7 +27,6 @@ gen := $(addprefix $(out_base)/,$(genf))
$(gen): $(out_root)/cli/cli
$(gen): cli := $(out_root)/cli/cli
-$(gen): cli_options :=
$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
diff --git a/tests/file/makefile b/tests/file/makefile
index 68b28f7..011582a 100644
--- a/tests/file/makefile
+++ b/tests/file/makefile
@@ -29,7 +29,7 @@ gen := $(addprefix $(out_base)/,$(genf))
$(gen): $(out_root)/cli/cli
$(gen): cli := $(out_root)/cli/cli
-$(gen): cli_options := --generate-file-scanner
+$(gen): cli_options += --generate-file-scanner
$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))