4 files changed, 34 insertions, 31 deletions
diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in
index 9f37dd43b..5346e2eec 100644
--- a/src/build-data/makefile/gmake.in
+++ b/src/build-data/makefile/gmake.in
@@ -1,18 +1,5 @@
 %{header_in}
 
-COPY             = cp
-LN               = ln -fs
-
-# Library targets
-LIB_BASENAME  = %{lib_basename}
-STATIC_LIB    = %{out_dir}/$(LIB_BASENAME).%{static_suffix}
-LIBRARIES     = $(STATIC_LIB)
-
-# Link Commands
-%{gmake_dso_in}
-
-libs: $(LIBRARIES)
-
 # Object Files
 LIBOBJS       = %{lib_objs}
 
@@ -27,6 +14,21 @@ TESTOBJS      = %{test_objs}
 
 %{test_build_cmds}
 
+COPY             = cp
+
+docs:
+%{build_doc_commands}
+
+# Library targets
+LIB_BASENAME  = %{lib_basename}
+STATIC_LIB    = %{out_dir}/$(LIB_BASENAME).%{static_suffix}
+LIBRARIES     = $(STATIC_LIB)
+
+# Link Commands
+%{gmake_dso_in}
+
+libs: $(LIBRARIES)
+
 $(CLI): $(LIBRARIES) $(CLIOBJS)
 	$(CLI_LINK_CMD) $(LDFLAGS) $(CLIOBJS) $(CLI_LINKS_TO) -o $(CLI)
 	$(CLI_POST_LINK_CMD)
diff --git a/src/build-data/makefile/gmake_dso.in b/src/build-data/makefile/gmake_dso.in
index 13f7b0a3b..abfe1e95f 100644
--- a/src/build-data/makefile/gmake_dso.in
+++ b/src/build-data/makefile/gmake_dso.in
@@ -7,6 +7,8 @@ DARWIN_CURRENT_VER       = %{version_packed}.%{so_abi_rev}.%{version_patch}
 
 SHARED_LIB      = %{out_dir}/$(SONAME_PATCH)
 
+LN              = ln -fs
+
 $(SHARED_LIB): $(LIBOBJS)
 	$(LIB_LINK_CMD) $(LDFLAGS) $(LIBOBJS) $(LIB_LINKS_TO) -o $(SHARED_LIB)
 	$(LN) $(SONAME_PATCH) %{out_dir}/$(SONAME_ABI)
diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in
index 0d7197eaf..f72b72882 100644
--- a/src/build-data/makefile/header.in
+++ b/src/build-data/makefile/header.in
@@ -44,9 +44,6 @@ tests: $(TEST)
 SPHINX_CONFIG = %{sphinx_config_dir}
 SPHINX_OPTS = -b html
 
-docs:
-%{build_doc_commands}
-
 clean:
 	$(PYTHON_EXE) $(SCRIPTS_DIR)/cleanup.py --build-dir="%{build_dir}"
 
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in
index 31b86c000..0eca6d6b4 100644
--- a/src/build-data/makefile/nmake.in
+++ b/src/build-data/makefile/nmake.in
@@ -1,9 +1,25 @@
 %{header_in}
 
-### Aliases for Common Programs
+# Object Files
+LIBOBJS       = %{lib_objs}
+
+CLIOBJS       = %{cli_objs}
+
+TESTOBJS      = %{test_objs}
+
+# Build Commands
+%{lib_build_cmds}
+
+%{cli_build_cmds}
+
+%{test_build_cmds}
+
 
 COPY          = copy
 
+docs:
+%{build_doc_commands}
+
 # Library targets
 #
 # LIB_FILENAME is always the .lib file, that is either a static lib or a
@@ -20,20 +36,6 @@ 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)