Add the build commands back to the main makefiles

The header is processed early, but when doing an amalgamation we
need to regenerate the makefile template. But we only do that
for the main makefile not the include inputs.

Should fix this but for now just just get it to work.

3 files changed, 28 insertions, 14 deletions

diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in
index 15e0277e6..9f37dd43b 100644
--- a/src/build-data/makefile/gmake.in
+++ b/src/build-data/makefile/gmake.in
@@ -13,6 +13,20 @@ LIBRARIES     = $(STATIC_LIB)
 
 libs: $(LIBRARIES)
 
+# Object Files
+LIBOBJS       = %{lib_objs}
+
+CLIOBJS       = %{cli_objs}
+
+TESTOBJS      = %{test_objs}
+
+# Build Commands
+%{lib_build_cmds}
+
+%{cli_build_cmds}
+
+%{test_build_cmds}
+
 $(CLI): $(LIBRARIES) $(CLIOBJS)
 	$(CLI_LINK_CMD) $(LDFLAGS) $(CLIOBJS) $(CLI_LINKS_TO) -o $(CLI)
 	$(CLI_POST_LINK_CMD)
diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in
index 946960053..0d7197eaf 100644
--- a/src/build-data/makefile/header.in
+++ b/src/build-data/makefile/header.in
@@ -40,20 +40,6 @@ all: libs cli tests
 cli: $(CLI)
 tests: $(TEST)
 
-# Object Files
-LIBOBJS       = %{lib_objs}
-
-CLIOBJS       = %{cli_objs}
-
-TESTOBJS      = %{test_objs}
-
-# Build Commands
-%{lib_build_cmds}
-
-%{cli_build_cmds}
-
-%{test_build_cmds}
-
 # Misc targets
 SPHINX_CONFIG = %{sphinx_config_dir}
 SPHINX_OPTS = -b html
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in
index c44fd33aa..31b86c000 100644
--- a/src/build-data/makefile/nmake.in
+++ b/src/build-data/makefile/nmake.in
@@ -20,6 +20,20 @@ SO_FILENAME   = %{out_dir}\$(LIB_BASENAME).dll
 LIBRARIES     = $(SO_FILENAME)
 !Endif
 
+# Object Files
+LIBOBJS       = %{lib_objs}
+
+CLIOBJS       = %{cli_objs}
+
+TESTOBJS      = %{test_objs}
+
+# Build Commands
+%{lib_build_cmds}
+
+%{cli_build_cmds}
+
+%{test_build_cmds}
+
 # Link Commands
 $(CLI): $(LIBRARIES) $(CLIOBJS)
 	$(CLI_LINK_CMD) /OUT:$@ $(CLIOBJS) $(LIB_FILENAME) $(CLI_LINKS_TO)