From 923d1ec2f451c336da4ca507af49a3e9a01f9449 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 12 Feb 2008 12:41:21 +0100 Subject: Fix installation of python module for ldb and tdb. (This used to be commit 6c9a8bf9f03cef0fc1c5f7ec3f8786eccf79c851) --- source4/lib/tdb/Makefile.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source4/lib/tdb') diff --git a/source4/lib/tdb/Makefile.in b/source4/lib/tdb/Makefile.in index 8c79f6e24c..4a95fdb380 100644 --- a/source4/lib/tdb/Makefile.in +++ b/source4/lib/tdb/Makefile.in @@ -32,11 +32,13 @@ tdbdir = @tdbdir@ TDB_OBJ = @TDB_OBJ@ @LIBREPLACEOBJ@ -all:: showflags dirs $(PROGS) $(SOLIB) libtdb.a $(PYTHON_BUILD_TARGET) +default: all include $(tdbdir)/tdb.mk include $(tdbdir)/rules.mk +all:: showflags dirs $(PROGS) $(SOLIB) libtdb.a $(PYTHON_BUILD_TARGET) + install:: all $(SOLIB): $(TDB_OBJ) $(SHLD) $(SHLD_FLAGS) -o $@ $(TDB_OBJ) @SONAMEFLAG@$(SONAME) -- cgit From 18ef7670857eeaec59d68fb8063570e67c6297a6 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 12 Feb 2008 13:07:16 +0100 Subject: Specify PICFLAG when compiling python modules. (This used to be commit 981957165d09e82947f68475192f1ce1f0ddbdd3) --- source4/lib/tdb/tdb.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/tdb') diff --git a/source4/lib/tdb/tdb.mk b/source4/lib/tdb/tdb.mk index fe77a0492d..ea4389640e 100644 --- a/source4/lib/tdb/tdb.mk +++ b/source4/lib/tdb/tdb.mk @@ -36,7 +36,7 @@ clean:: build-python:: _tdb.$(SHLIBEXT) tdb_wrap.o: $(tdbdir)/tdb_wrap.c - $(CC) -c $(tdbdir)/tdb_wrap.c $(CFLAGS) `$(PYTHON_CONFIG) --cflags` + $(CC) $(PICFLAG) -c $(tdbdir)/tdb_wrap.c $(CFLAGS) `$(PYTHON_CONFIG) --cflags` _tdb.$(SHLIBEXT): libtdb.$(SHLIBEXT) tdb_wrap.o $(SHLD) $(SHLD_FLAGS) -o $@ tdb_wrap.o -L. -ltdb `$(PYTHON_CONFIG) --libs` -- cgit From 285820bdd4ea94ac78ded03ec6388ca8c777358c Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 12 Feb 2008 13:34:19 +0100 Subject: make sure libraries are built before attempting to install. (This used to be commit deb1dae2dabad3d74a1c6adf2c0b0d56917cca83) --- source4/lib/tdb/tdb.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/lib/tdb') diff --git a/source4/lib/tdb/tdb.mk b/source4/lib/tdb/tdb.mk index ea4389640e..5cf0d5badb 100644 --- a/source4/lib/tdb/tdb.mk +++ b/source4/lib/tdb/tdb.mk @@ -66,13 +66,13 @@ installdirs:: mkdir -p $(DESTDIR)$(libdir) mkdir -p $(DESTDIR)$(libdir)/pkgconfig -installbin:: installdirs +installbin:: all installdirs cp $(PROGS) $(DESTDIR)$(bindir) installheaders:: installdirs cp $(srcdir)/include/tdb.h $(DESTDIR)$(includedir) -installlibs:: installdirs +installlibs:: all installdirs cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig cp libtdb.a $(SOLIB) $(DESTDIR)$(libdir) -- cgit From 1ed346fcb37f302341f528e2f8465d389f586742 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 12 Feb 2008 13:51:03 +0100 Subject: Support using shared library during testsuite run if tdb was built with a shared lib internally. (This used to be commit 28539f48e6ad37a6436e6f2c6733ee1fcbc6567f) --- source4/lib/tdb/tdb.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/lib/tdb') diff --git a/source4/lib/tdb/tdb.mk b/source4/lib/tdb/tdb.mk index 5cf0d5badb..d0f9815c13 100644 --- a/source4/lib/tdb/tdb.mk +++ b/source4/lib/tdb/tdb.mk @@ -25,8 +25,8 @@ bin/tdbdump$(EXEEXT): tools/tdbdump.o $(TDB_LIB) bin/tdbbackup$(EXEEXT): tools/tdbbackup.o $(TDB_LIB) $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb -test:: bin/tdbtorture$(EXEEXT) - bin/tdbtorture$(EXEEXT) +test:: bin/tdbtorture$(EXEEXT) $(SONAME) + $(LIB_PATH_VAR)=. bin/tdbtorture$(EXEEXT) clean:: rm -f test.db test.tdb torture.tdb test.gdbm -- cgit