5 files changed, 9 insertions, 12 deletions
diff --git a/configure.py b/configure.py
index 687f09cae..c7d650170 100755
--- a/configure.py
+++ b/configure.py
@@ -1321,15 +1321,13 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
                                                                      build_config.pkg_config_file()))
 
     vars["header_in"] = process_template('src/build-data/makefile/header.in', vars)
-    vars["commands_in"] = process_template('src/build-data/makefile/commands.in', vars)
 
-    vars["coverage_in"] = process_template('src/build-data/makefile/coverage.in', vars) \
-                          if options.build_mode == 'coverage' else ''
-
-    if options.build_shared_lib:
-        vars["dso_in"] = process_template('src/build-data/makefile/dso.in', vars)
-    else:
-        vars["dso_in"] = ""
+    if vars["makefile_style"] == "gmake":
+        vars["gmake_commands_in"] = process_template('src/build-data/makefile/gmake_commands.in', vars)
+        vars["gmake_dso_in"]      = process_template('src/build-data/makefile/gmake_dso.in', vars) \
+                                    if options.build_shared_lib else ''
+        vars["gmake_coverage_in"] = process_template('src/build-data/makefile/gmake_coverage.in', vars) \
+                                    if options.build_mode == 'coverage' else ''
 
     return vars
 
diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in
index 191b0739f..ac3b8fae1 100644
--- a/src/build-data/makefile/gmake.in
+++ b/src/build-data/makefile/gmake.in
@@ -1,6 +1,6 @@
 %{header_in}
 
-%{commands_in}
+%{gmake_commands_in}
 
 # Executable targets
 APP           = %{out_dir}/botan%{program_suffix}
@@ -31,7 +31,7 @@ all: $(APP) $(TEST)
 %{test_build_cmds}
 
 # Link Commands
-%{dso_in}
+%{gmake_dso_in}
 
 $(APP): $(LIBRARIES) $(APPOBJS)
 	$(CXX) $(LDFLAGS) $(APPOBJS) -L%{out_dir} -l%{libname} $(APP_LINKS_TO) -o $(APP)
@@ -44,7 +44,7 @@ $(STATIC_LIB): $(LIBOBJS)
 	$(AR) $(STATIC_LIB) $(LIBOBJS)
 	$(RANLIB) $(STATIC_LIB)
 
-%{coverage_in}
+%{gmake_coverage_in}
 
 SPHINX_CONFIG = %{sphinx_config_dir}
 SPHINX_OPTS = -b html
diff --git a/src/build-data/makefile/commands.in b/src/build-data/makefile/gmake_commands.in
index 33c6634c3..33c6634c3 100644
--- a/src/build-data/makefile/commands.in
+++ b/src/build-data/makefile/gmake_commands.in
diff --git a/src/build-data/makefile/coverage.in b/src/build-data/makefile/gmake_coverage.in
index 3dbbe686f..1ce9927a4 100644
--- a/src/build-data/makefile/coverage.in
+++ b/src/build-data/makefile/gmake_coverage.in
@@ -1,4 +1,3 @@
-
 lcov:
 	lcov --directory build/obj/lib/ --directory src/lib --no-external --capture --output-file botan.info
 	genhtml botan.info -o coverage/
diff --git a/src/build-data/makefile/dso.in b/src/build-data/makefile/gmake_dso.in
index 0e7974791..0e7974791 100644
--- a/src/build-data/makefile/dso.in
+++ b/src/build-data/makefile/gmake_dso.in