diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-02-13 10:14:04 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-02-13 10:14:04 +1100 |
| commit | 7714a91f6762bb8d6578d89a49bfd5672aca054c (patch) | |
| tree | 60b4d72b94ecb96f95e4d8e7041bf8abe58e8fa8 /source4/lib/tdb | |
| parent | e94d710b0b959d8e69eb02ef0704ebcff56485fb (diff) | |
| parent | 3cfac63d165f072464e93a12f7ad48450c66477b (diff) | |
| download | samba-7714a91f6762bb8d6578d89a49bfd5672aca054c.tar.gz samba-7714a91f6762bb8d6578d89a49bfd5672aca054c.tar.bz2 samba-7714a91f6762bb8d6578d89a49bfd5672aca054c.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 11102681bcd70b0abb2df38bcdc7fdec51e71600)
Diffstat (limited to 'source4/lib/tdb')
| -rw-r--r-- | source4/lib/tdb/Makefile.in | 4 | ||||
| -rw-r--r-- | source4/lib/tdb/tdb.mk | 10 |
2 files changed, 8 insertions, 6 deletions
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) diff --git a/source4/lib/tdb/tdb.mk b/source4/lib/tdb/tdb.mk index fe77a0492d..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 @@ -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` @@ -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) |