diff options
| author | simon <[email protected]> | 2015-06-18 05:27:45 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2015-06-18 05:27:45 +0000 |
| commit | b022ea558f912b9237455e3b3db31a3c53e12be9 (patch) | |
| tree | 1c1675d37646d83f7751d9520bdb8ff20997c3e2 /configure.py | |
| parent | b0fc63ec42a99b570771925c102df676e494ae7f (diff) | |
Update build system:
- Remove unused make variables VERSION, BRANCH
- Move first make all target below all variable definitions
- Move "Executable targets" as well as "LIBNAME" from header.in into
gmake.in and nmake.in. Those variables differ more than they share
and are getting too abstract.
- Use new variable names: LIB_BASENAME, LIB_FILENAME. Drop LIBNAME and
BOTAN_LIB
- Write libs to out_dir now, which enables out-of-tree builds
GH #110, replaces #70 #106 #107 fixes #85
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.py b/configure.py index 5c4a602ab..687f09cae 100755 --- a/configure.py +++ b/configure.py @@ -1278,7 +1278,9 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo): 'shared_flags': cc.gen_shared_flags(options), 'visibility_attribute': cc.gen_visibility_attribute(options), - 'libname': 'botan-%d.%d' % (build_config.version_major, build_config.version_minor), + # 'botan' or 'botan-1.11'. Used in Makefile and install script + # This can be made constistent over all platforms in the future + 'libname': 'botan' if options.os == 'windows' else 'botan-%d.%d' % (build_config.version_major, build_config.version_minor), 'so_link': cc.so_link_command_for(osinfo.basename), |