diff --git a/Makefile b/Makefile index fbfcdce80f735d1a3daedccb8e986ec0e4778a98..3452a66585a463b1ade85a5f616e44d52b589610 100644 --- a/Makefile +++ b/Makefile @@ -24,24 +24,7 @@ MAKECONFIG_DIR=share -include share/Makefile.common - -############################################################################## -# DUNE OPTIONS -################################ - -DUNE_BUILD_OPTS?= - -RELEASE?=no -ifeq ($(RELEASE),yes) -DUNE_BUILD_OPTS+=--release -endif - -# DUNE_DISPLAY: chose Dune build verbosity (see '--display' dune option) -# Default: progress (same as dune default) -# Recommend for tests: short -DUNE_DISPLAY?=progress -DUNE_BUILD_OPTS+=--display $(DUNE_DISPLAY) +include $(MAKECONFIG_DIR)/Makefile.common ############################################################################## # PTESTS SRC diff --git a/share/Makefile.common b/share/Makefile.common index 8ce54338620771a0d474d640821cda807259d3c5..f2ed89e458f18e7f6ad686ed0c86043c1789e7a5 100644 --- a/share/Makefile.common +++ b/share/Makefile.common @@ -26,6 +26,23 @@ # # ########################################################################## +################ +# DUNE OPTIONS # +################ + +DUNE_BUILD_OPTS?= + +RELEASE?=no +ifeq ($(RELEASE),yes) +DUNE_BUILD_OPTS+=--release +endif + +# DUNE_DISPLAY: chose Dune build verbosity (see '--display' dune option) +# Default: progress (same as dune default) +# Recommend for tests: short +DUNE_DISPLAY?=progress +DUNE_BUILD_OPTS+=--display $(DUNE_DISPLAY) + ############# # Platform # ############# diff --git a/share/dune b/share/dune index b0f8d4ff74f61a15acc53797f0e7f6ee289ec82d..0d74ac4763cb5ad529d9eb193cb7fe2a01309211 100644 --- a/share/dune +++ b/share/dune @@ -25,6 +25,7 @@ (section (site (frama-c share))) (files ; Useful Makefiles +(Makefile.common as Makefile.common) (Makefile.headers as Makefile.headers) (Makefile.linting as Makefile.linting) (Makefile.installation as Makefile.installation)