diff options
| author | lloyd <[email protected]> | 2013-04-23 13:56:46 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2013-04-23 13:56:46 +0000 |
| commit | ebba0f10ae6c791e8d2e94439df89dd1d7b7e782 (patch) | |
| tree | 75325fd8ee5fd633b540369aa7681c8e7835b116 /src/build-data/makefile | |
| parent | 01d7c3d72a71a31c137ddfd994e259d678fde838 (diff) | |
Fix Windows and static-only makefiles
Diffstat (limited to 'src/build-data/makefile')
| -rw-r--r-- | src/build-data/makefile/nmake.in | 7 | ||||
| -rw-r--r-- | src/build-data/makefile/unix.in | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index 3e20d988a..26fb450a3 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -2,13 +2,15 @@ CXX = %{cc} LIB_OPT = %{lib_opt} CHECK_OPT = %{check_opt} -MACH_OPT = %{mach_opt} LANG_FLAGS = %{lang_flags} WARN_FLAGS = %{warn_flags} SO_OBJ_FLAGS = %{shared_flags} LIB_LINK_CMD = %{so_link} LINK_TO = %{link_to} +LIB_FLAGS = $(LIB_OPT) $(LANG_FLAGS) $(WARN_FLAGS) $(SO_OBJ_FLAGS) +CHECK_FLAGS = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS) + ### Version Numbers VERSION = %{version} @@ -37,9 +39,6 @@ LIBOBJS = %{lib_objs} CHECKOBJS = %{check_objs} -LIB_FLAGS = $(LIB_OPT) $(MACH_OPT) $(LANG_FLAGS) $(WARN_FLAGS) $(SO_OBJ_FLAGS) -CHECK_FLAGS = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS) - LIBNAME = botan LIBRARIES = $(BOTAN_LIB) diff --git a/src/build-data/makefile/unix.in b/src/build-data/makefile/unix.in index ca881d65d..0b6afe0c3 100644 --- a/src/build-data/makefile/unix.in +++ b/src/build-data/makefile/unix.in @@ -2,12 +2,11 @@ CXX = %{cc} LIB_OPT = %{lib_opt} CHECK_OPT = %{check_opt} -MACH_OPT = %{mach_opt} LANG_FLAGS = %{lang_flags} WARN_FLAGS = %{warn_flags} LINK_TO = %{link_to} -LIB_FLAGS = $(LIB_OPT) $(MACH_OPT) $(LANG_FLAGS) $(WARN_FLAGS) +LIB_FLAGS = $(LIB_OPT) $(LANG_FLAGS) $(WARN_FLAGS) CHECK_FLAGS = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS) # Version Numbers |