diff options
| -rw-r--r-- | src/build-data/makefile/gmake_commands.in | 8 | ||||
| -rw-r--r-- | src/build-data/makefile/header.in | 7 | ||||
| -rw-r--r-- | src/build-data/makefile/nmake.in | 8 |
3 files changed, 6 insertions, 17 deletions
diff --git a/src/build-data/makefile/gmake_commands.in b/src/build-data/makefile/gmake_commands.in index ae0586443..3d492ae51 100644 --- a/src/build-data/makefile/gmake_commands.in +++ b/src/build-data/makefile/gmake_commands.in @@ -1,13 +1,5 @@ # Program aliases -AR = %{ar_command} COPY = cp -COPY_R = cp -r -CD = @cd -ECHO = @echo -INSTALL_CMD_EXEC = %{install_cmd_exec} -INSTALL_CMD_DATA = %{install_cmd_data} LN = ln -fs -MKDIR = @mkdir -MKDIR_INSTALL = @umask 022; mkdir -p -m 755 RM = @rm -f RM_R = @rm -rf diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in index 9929bc4ba..de31c8a0b 100644 --- a/src/build-data/makefile/header.in +++ b/src/build-data/makefile/header.in @@ -1,9 +1,12 @@ -# Compiler Options +# Paths to relevant programs + CXX = %{cxx} %{cxx_abi_flags} LINKER = %{linker} - +AR = %{ar_command} PYTHON_EXE = %{python_exe} +# Compiler Flags + LANG_FLAGS = %{cc_lang_flags} CXXFLAGS = %{cc_compile_flags} WARN_FLAGS = %{cc_warning_flags} diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index 8ed1625f5..eba3a774d 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -1,14 +1,8 @@ %{header_in} ### Aliases for Common Programs -AR = %{ar_command} + COPY = copy -CD = @cd -ECHO = @echo -INSTALL = %{install_cmd_exec} -INSTALL_CMD = %{install_cmd_exec} -MKDIR = @md -MKDIR_INSTALL = @md RM = @del /Q RM_R = $(RM) /S RMDIR = @rmdir |