Move flavors (variants) to Config.mak

Also move any other compiler flag that should be user-defined to
Config.mak, as they should not be imposed to the user.

diff --git a/Config.mak b/Config.mak
index 6d270877f530413aa701b209f928ffba0947a89e..c32caacfcbf84de94af581da9a2f08bfb47ccbff 100644 (file)
--- a/Config.mak
+++ b/Config.mak
@@ -8,3 +8,28 @@ CC := gcc
 # Use pre-compiled headers
 GCH := 1
 
+# Warn about everything
+override CPPFLAGS += -Wall
+override LDFLAGS += -Wall
+
+# Be standard compliant
+override CFLAGS += -std=c99 -pedantic
+override CXXFLAGS += -std=c++98 -pedantic
+
+
+# Flavors (variants) flags
+##########################
+
+ifeq ($F,dbg)
+override CPPFLAGS += -ggdb -DDEBUG
+endif
+
+ifeq ($F,opt)
+override CPPFLAGS += -O2 -DNDEBUG
+endif
+
+ifeq ($F,cov)
+override CPPFLAGS += -ggdb -pg --coverage
+override LDFLAGS += -pg --coverage
+endif
+

diff --git a/Makeit.mak b/Makeit.mak
index 68664221cfc39301919bb5cdebb35636ec17f3e8..8964fe2dce5921fab107c232e15a96432a2d9ea2 100644 (file)
--- a/Makeit.mak
+++ b/Makeit.mak
@@ -38,8 +38,8 @@ COLOR_WARN ?= 00;36
 # See COLOR_CMD comment for details.
 COLOR_OUT ?= 00;31
 
-# Flavor (variant), should be one of "dbg", "opt" or "cov"
-F ?= opt
+# Flavor (variant), can be defined by the user in Config.mak
+F ?= default
 
 # Use C++ linker by default
 LINKER := $(CXX)
@@ -311,43 +311,19 @@ valgrind = $(call exec,$(if $(VALGRIND),$(VALGRIND_CMD)) $1,\
 # Overridden flags
 ##################
 
-# Warn about everything
-override CPPFLAGS += -Wall
-
 # Use the includes directories to search for includes
 override CPPFLAGS += -I$(INCLUDE_DIR)
 
 # Let the program know where it will be installed
 override CPPFLAGS += -DPREFIX=$(prefix)
 
-# Be standard compliant
-override CFLAGS += -std=c99 -pedantic
-override CXXFLAGS += -std=c++98 -pedantic
-
 # Use the generated library directory to for libraries
-override LDFLAGS += -L$L -Wall
+override LDFLAGS += -L$L
 
 # Make sure the generated libraries can be found
 export LD_LIBRARY_PATH := $L:$(LD_LIBRARY_PATH)
 
 
-# Variant flags
-################
-
-ifeq ($F,dbg)
-override CPPFLAGS += -ggdb -DDEBUG
-endif
-
-ifeq ($F,opt)
-override CPPFLAGS += -O2 -DNDEBUG
-endif
-
-ifeq ($F,cov)
-override CPPFLAGS += -ggdb -pg --coverage
-override LDFLAGS += -pg --coverage
-endif
-
-
 # Automatic dependency handling
 ################################