aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/changelog/makefile5
-rw-r--r--common/makefile2
2 files changed, 4 insertions, 3 deletions
diff --git a/common/changelog/makefile b/common/changelog/makefile
index 0e4ecf9..8d5e96d 100644
--- a/common/changelog/makefile
+++ b/common/changelog/makefile
@@ -38,8 +38,8 @@ gen := $(addprefix $(out_base)/,$(genf))
$(gen): $(odb) FORCE # Force regeneration even if up to date.
$(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database $(db_id) \
---generate-schema-only --schema-format sql --changelog-dir $(out_base)
+$(gen): export odb_options += --database $(db_id) --generate-schema-only \
+--schema-format sql --suppress-migration --changelog-dir $(out_base)
$(gen): cpp_options := -I$(src_base)
$(gen): $(common.l.cpp-options)
@@ -47,6 +47,7 @@ ifdef STEP
ifeq ($(STEP),1)
$(gen): cpp_options += -DBVER=1 -DCVER=1 # Initialize.
+$(gen): odb_options += --init-changelog # Suppress notice.
else ifeq ($(STEP),2)
$(gen): cpp_options += -DBVER=1 -DCVER=2 # Diff.
else ifeq ($(STEP),3)
diff --git a/common/makefile b/common/makefile
index 3eb05e2..ebf969a 100644
--- a/common/makefile
+++ b/common/makefile
@@ -79,7 +79,7 @@ $(dist): name := $(name)
$(dist): export dirs := $(filter-out $(no_dist_tests),$(tests))
$(dist): export thread_dirs := $(thread_tests)
$(dist): export cxx11_dirs := $(cxx11_tests)
-$(dist): export extra_dist := test.bat $(call vc9slns,$(name)) \
+$(dist): export extra_dist := test.bat $(call vc9slns,$(name)) \
$(call vc10slns,$(name)) $(call vc11slns,$(name))
$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests)))
$(call meta-automake)