diff options
| -rw-r--r-- | lib/tdb/Makefile.in | 1 | ||||
| -rwxr-xr-x | lib/tdb/autogen.sh | 2 | ||||
| -rw-r--r-- | lib/tdb/tdb.mk | 16 |
3 files changed, 5 insertions, 14 deletions
diff --git a/lib/tdb/Makefile.in b/lib/tdb/Makefile.in index 9915d88264..df1b02be6a 100644 --- a/lib/tdb/Makefile.in +++ b/lib/tdb/Makefile.in @@ -23,7 +23,6 @@ SHLD_FLAGS = @SHLD_FLAGS@ PACKAGE_VERSION = @PACKAGE_VERSION@ PICFLAG = @PICFLAG@ SHLIBEXT = @SHLIBEXT@ -SWIG = swig PYTHON = @PYTHON@ PYTHON_CONFIG = @PYTHON_CONFIG@ PYTHON_BUILD_TARGET = @PYTHON_BUILD_TARGET@ diff --git a/lib/tdb/autogen.sh b/lib/tdb/autogen.sh index 88ac4cfcf7..bf84eeee19 100755 --- a/lib/tdb/autogen.sh +++ b/lib/tdb/autogen.sh @@ -9,8 +9,6 @@ autoheader $IPATHS || exit 1 rm -rf autom4te.cache -swig -O -Wall -python -keyword tdb.i # Ignore errors for now - echo "Now run ./configure and then make." exit 0 diff --git a/lib/tdb/tdb.mk b/lib/tdb/tdb.mk index fa8db6d34c..0254575039 100644 --- a/lib/tdb/tdb.mk +++ b/lib/tdb/tdb.mk @@ -33,32 +33,26 @@ clean:: rm -f $(TDB_SONAME) $(TDB_SOLIB) libtdb.a libtdb.$(SHLIBEXT) rm -f $(ALL_PROGS) tdb.pc -build-python:: _tdb.$(SHLIBEXT) +build-python:: tdb.$(SHLIBEXT) tdb_wrap.o: $(tdbdir)/tdb_wrap.c $(CC) $(PICFLAG) -c $(tdbdir)/tdb_wrap.c $(CFLAGS) `$(PYTHON_CONFIG) --cflags` -_tdb.$(SHLIBEXT): libtdb.$(SHLIBEXT) tdb_wrap.o +tdb.$(SHLIBEXT): libtdb.$(SHLIBEXT) tdb_wrap.o $(SHLD) $(SHLD_FLAGS) -o $@ tdb_wrap.o -L. -ltdb `$(PYTHON_CONFIG) --ldflags` install:: installdirs installbin installheaders installlibs \ $(PYTHON_INSTALL_TARGET) install-python:: build-python - mkdir -p $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(0, prefix='$(prefix)')"` \ - $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"` - cp $(tdbdir)/tdb.py $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(0, prefix='$(prefix)')"` - cp _tdb.$(SHLIBEXT) $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"` + mkdir -p $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"` + cp tdb.$(SHLIBEXT) $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"` check-python:: build-python $(TDB_SONAME) $(LIB_PATH_VAR)=. PYTHONPATH=".:$(tdbdir)" $(PYTHON) $(tdbdir)/python/tests/simple.py -install-swig:: - mkdir -p $(DESTDIR)`$(SWIG) -swiglib` - cp tdb.i $(DESTDIR)`$(SWIG) -swiglib` - clean:: - rm -f _tdb.$(SHLIBEXT) + rm -f tdb.$(SHLIBEXT) installdirs:: mkdir -p $(DESTDIR)$(bindir) |