diff options
| -rwxr-xr-x | configure.py | 16 | ||||
| -rw-r--r-- | src/build-data/makefile/gmake.in | 6 | ||||
| -rw-r--r-- | src/build-data/makefile/header.in | 6 | ||||
| -rw-r--r-- | src/build-data/makefile/nmake.in | 7 |
4 files changed, 18 insertions, 17 deletions
diff --git a/configure.py b/configure.py index c069a86c7..fbf2205eb 100755 --- a/configure.py +++ b/configure.py @@ -411,16 +411,19 @@ def process_command_line(args): install_group = optparse.OptionGroup(parser, 'Installation options') + install_group.add_option('--program-suffix', metavar='SUFFIX', + help='append string to program names') + install_group.add_option('--prefix', metavar='DIR', help='set the install prefix') + install_group.add_option('--destdir', metavar='DIR', + help='set the install directory') install_group.add_option('--docdir', metavar='DIR', help='set the documentation install directory') install_group.add_option('--libdir', metavar='DIR', help='set the library install directory') install_group.add_option('--includedir', metavar='DIR', help='set the include file install directory') - install_group.add_option('--destdir', metavar='DIR', - help='set the install directory') parser.add_option_group(target_group) parser.add_option_group(build_group) @@ -1163,7 +1166,7 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo): maintainer_flags, maintainer_mode): if maintainer_mode and maintainer_flags != '': - return maintainer_flags + ' ' + normal_flags + return normal_flags + ' ' + maintainer_flags else: return normal_flags @@ -1207,13 +1210,14 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo): 'makefile_path': prefix_with_build_dir('Makefile'), + 'program_suffix': options.program_suffix or '', + 'prefix': options.prefix or osinfo.install_root, + 'destdir': options.destdir or options.prefix or osinfo.install_root, 'libdir': options.libdir or osinfo.lib_dir, 'includedir': options.includedir or osinfo.header_dir, 'docdir': options.docdir or osinfo.doc_dir, - 'destdir': options.destdir or options.prefix or osinfo.install_root, - 'build_dir': build_config.build_dir, 'appobj_dir': build_config.appobj_dir, @@ -1725,7 +1729,7 @@ def generate_amalgamation(build_config): amalg_header = """/* * Botan %s Amalgamation -* (C) 1999-2013 Jack Lloyd and others +* (C) 1999-2013,2014 Jack Lloyd and others * * Distributed under the terms of the Botan license */ diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in index 5886ad5bb..e9320ce02 100644 --- a/src/build-data/makefile/gmake.in +++ b/src/build-data/makefile/gmake.in @@ -2,9 +2,7 @@ %{commands_in} -# Targets -APP = %{app_prefix}botan -TEST = %{app_prefix}botan-test +# Library targets LIBRARIES = $(STATIC_LIB) LIBNAME = %{lib_prefix}libbotan @@ -12,8 +10,6 @@ STATIC_LIB = $(LIBNAME)-$(BRANCH).a LIBPATH = botan-$(BRANCH) -all: $(APP) $(TEST) - # File Lists INCLUDE_DIR = %{botan_include_dir} diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in index 5f81fa0a5..c481f65f3 100644 --- a/src/build-data/makefile/header.in +++ b/src/build-data/makefile/header.in @@ -30,3 +30,9 @@ PKGCONF_DIR = $(LIBDIR)/pkgconfig CONFIG_SCRIPT = %{botan_config} PKGCONFIG = %{botan_pkgconfig} + +# Executable targets +APP = %{app_prefix}botan%{program_suffix} +TEST = %{app_prefix}botan-test%{program_suffix} + +all: $(APP) $(TEST) diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index 9ab563b1a..f45690d06 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -13,10 +13,7 @@ RM = @del /Q RM_R = $(RM) /S RMDIR = @rmdir -### File Lists -APP = %{app_prefix}botan -TEST = %{app_prefix}botan-test - +### Library targets LIBOBJS = %{lib_objs} APPOBJS = %{app_objs} @@ -30,8 +27,6 @@ LIBRARIES = $(BOTAN_LIB) # This will be either a static lib or the DLL import lib BOTAN_LIB = $(LIBNAME).%{static_suffix} -all: $(APP) $(TEST) - # Build Commands %{lib_build_cmds} |