diff options
| author | lloyd <[email protected]> | 2010-03-02 14:44:19 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-03-02 14:44:19 +0000 |
| commit | 8e61a01e9a86b3179d760766468257ced024d497 (patch) | |
| tree | e8509d38f32ffeec955da5e5a80d08ece201b3a0 | |
| parent | 64d264518a7c9c0cfa64e70e9f146d1e92e42523 (diff) | |
Use a single dir for all boost.python objects
| -rwxr-xr-x | configure.py | 2 | ||||
| -rw-r--r-- | src/build-data/makefile/python.in | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/configure.py b/configure.py index b4712b171..423a6b80d 100755 --- a/configure.py +++ b/configure.py @@ -986,6 +986,8 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo): build_commands(build_config.check_sources, build_config.checkobj_dir, 'CHECK')), + 'python_obj_dir': build_config.pyobject_dir, + 'python_objs': makefile_list( objectfile_list(build_config.python_sources, build_config.pyobject_dir)), diff --git a/src/build-data/makefile/python.in b/src/build-data/makefile/python.in index 9658c70ce..d3b4a122b 100644 --- a/src/build-data/makefile/python.in +++ b/src/build-data/makefile/python.in @@ -6,17 +6,15 @@ PYTHON_SITE_PACKAGE_DIR = /usr/lib/python%{python_version}/site-packages/ PYTHON_FLAGS = -Isrc/wrap/python -Os -fPIC -ftemplate-depth-255 -Wall -Wno-unused $(PYTHON_INC) -PYTHON_OBJS = %{python_objs} +BOTAN_PYTHON_MODDIR = %{python_obj_dir} -BOTAN_PYTHON_MODDIR = build/botan-python +PYTHON_OBJS = %{python_objs} all: $(BOTAN_PYTHON_MODDIR)/_botan.so %{python_build_cmds} $(BOTAN_PYTHON_MODDIR)/_botan.so: $(PYTHON_OBJS) - rm -rf $(BOTAN_PYTHON_MODDIR) - mkdir $(BOTAN_PYTHON_MODDIR) cp src/wrap/python/*.py $(BOTAN_PYTHON_MODDIR) $(CXX) -shared -o $@ $(PYTHON_OBJS) -L. -L$(PYTHON_ROOT) -lbotan -lboost_python -Wl,-rpath-link,. -Wl,-soname,$@ @@ -25,5 +23,5 @@ clean: install: mkdir -p $(PYTHON_SITE_PACKAGE_DIR)/botan - cp $(BOTAN_PYTHON_MODDIR)/* $(PYTHON_SITE_PACKAGE_DIR)/botan + cp $(BOTAN_PYTHON_MODDIR)/_botan.so $(BOTAN_PYTHON_MODDIR)/*.py $(PYTHON_SITE_PACKAGE_DIR)/botan chmod -R u=rwX,go=rX $(PYTHON_SITE_PACKAGE_DIR)/botan |