From 9e1e585aa2740bd55bd60d965bd6c271ee9caa2e Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Mon, 22 Dec 2008 17:30:41 -0500 Subject: Rebase tdb code with all changes in samba master --- tdb/tdb.mk | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'tdb/tdb.mk') diff --git a/tdb/tdb.mk b/tdb/tdb.mk index fa8db6d3..02545750 100644 --- a/tdb/tdb.mk +++ b/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) -- cgit