diff options
| author | Jack Lloyd <[email protected]> | 2017-12-02 05:50:46 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-12-02 08:24:59 -0500 |
| commit | 3415a93a774f631e156ee8a187e376ff2789f27d (patch) | |
| tree | ce7b2ba7974126c578287140e28dc1e90ac3ff98 /src/build-data | |
| parent | 70e88d6d5b8179e1bc0d96b20aa0f63e0960a900 (diff) | |
Accept CXXFLAGS and LDFLAGS from environment (GH #1237)
Also remove a duplicated block (rebase error)
Diffstat (limited to 'src/build-data')
| -rw-r--r-- | src/build-data/makefile.in | 11 | ||||
| -rw-r--r-- | src/build-data/os/darwin.txt | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in index 89098c466..2c97ef792 100644 --- a/src/build-data/makefile.in +++ b/src/build-data/makefile.in @@ -11,6 +11,7 @@ LANG_FLAGS = %{cc_lang_flags} CXXFLAGS = %{cc_compile_flags} WARN_FLAGS = %{cc_warning_flags} SO_OBJ_FLAGS = %{shared_flags} +LDFLAGS = %{ldflags} LIB_LINK_CMD = %{lib_link_cmd} EXE_LINK_CMD = %{exe_link_cmd} @@ -27,7 +28,7 @@ INSTALLED_LIB_DIR = %{prefix}/%{libdir} POST_LINK_CMD = %{post_link_cmd} # The primary target -all: libs cli tests +all: libs cli tests docs # Executable targets CLI = %{cli_exe} @@ -40,18 +41,18 @@ libs: $(LIBRARIES) # Misc targets +docs: +%{build_doc_commands} + clean: $(PYTHON_EXE) $(SCRIPTS_DIR)/cleanup.py --build-dir="%{build_dir}" distclean: $(PYTHON_EXE) $(SCRIPTS_DIR)/cleanup.py --build-dir="%{build_dir}" --distclean -install: $(CLI) docs +install: libs cli docs $(PYTHON_EXE) $(SCRIPTS_DIR)/install.py --prefix=%{prefix} --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir} -docs: -%{build_doc_commands} - # Object Files LIBOBJS = %{lib_objs} diff --git a/src/build-data/os/darwin.txt b/src/build-data/os/darwin.txt index 4c8ba2c47..41716e21a 100644 --- a/src/build-data/os/darwin.txt +++ b/src/build-data/os/darwin.txt @@ -4,6 +4,8 @@ soname_pattern_base "libbotan-{version_major}.dylib" soname_pattern_abi "libbotan-{version_major}.{abi_rev}.dylib" soname_pattern_patch "libbotan-{version_major}.{abi_rev}.{version_minor}.{version_patch}.dylib" +# In order that these executables work from the build directory, +# we need to change the install names so_post_link_command "install_name_tool -change '$(INSTALLED_LIB_DIR)/{soname_abi}' '@executable_path/{soname_abi}' $@" doc_dir doc |