diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-13 17:42:10 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-13 17:42:10 +0100 |
| commit | 8a3f8dc646585c1861ac7322ad67a93353fa0c71 (patch) | |
| tree | 813824fe28a27d83ab638e61e87bbf122b4f7c2d /source4/lib/tdb | |
| parent | 05d58f49df30791e205799366666804d4a9bf47d (diff) | |
| download | samba-8a3f8dc646585c1861ac7322ad67a93353fa0c71.tar.gz samba-8a3f8dc646585c1861ac7322ad67a93353fa0c71.tar.bz2 samba-8a3f8dc646585c1861ac7322ad67a93353fa0c71.zip | |
Allow tdb.mk and talloc.mk to be included at the same time.
(This used to be commit af9e0421529104d2583c58f7723abe8612e78f53)
Diffstat (limited to 'source4/lib/tdb')
| -rw-r--r-- | source4/lib/tdb/Makefile.in | 6 | ||||
| -rw-r--r-- | source4/lib/tdb/tdb.mk | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source4/lib/tdb/Makefile.in b/source4/lib/tdb/Makefile.in index 4a95fdb380..090bb6e2dc 100644 --- a/source4/lib/tdb/Makefile.in +++ b/source4/lib/tdb/Makefile.in @@ -37,11 +37,11 @@ default: all include $(tdbdir)/tdb.mk include $(tdbdir)/rules.mk -all:: showflags dirs $(PROGS) $(SOLIB) libtdb.a $(PYTHON_BUILD_TARGET) +all:: showflags dirs $(PROGS) $(TDB_SOLIB) libtdb.a $(PYTHON_BUILD_TARGET) install:: all -$(SOLIB): $(TDB_OBJ) - $(SHLD) $(SHLD_FLAGS) -o $@ $(TDB_OBJ) @SONAMEFLAG@$(SONAME) +$(TDB_SOLIB): $(TDB_OBJ) + $(SHLD) $(SHLD_FLAGS) -o $@ $(TDB_OBJ) @SONAMEFLAG@$(TDB_SONAME) check: test diff --git a/source4/lib/tdb/tdb.mk b/source4/lib/tdb/tdb.mk index d0f9815c13..0e53927366 100644 --- a/source4/lib/tdb/tdb.mk +++ b/source4/lib/tdb/tdb.mk @@ -5,8 +5,8 @@ PROGS = bin/tdbtool$(EXEEXT) bin/tdbdump$(EXEEXT) bin/tdbbackup$(EXEEXT) PROGS_NOINSTALL = bin/tdbtest$(EXEEXT) bin/tdbtorture$(EXEEXT) ALL_PROGS = $(PROGS) $(PROGS_NOINSTALL) -SONAME = libtdb.$(SHLIBEXT).1 -SOLIB = libtdb.$(SHLIBEXT).$(PACKAGE_VERSION) +TDB_SONAME = libtdb.$(SHLIBEXT).1 +TDB_SOLIB = libtdb.$(SHLIBEXT).$(PACKAGE_VERSION) TDB_LIB = libtdb.a @@ -25,12 +25,12 @@ 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) $(SONAME) +test:: bin/tdbtorture$(EXEEXT) $(TDB_SONAME) $(LIB_PATH_VAR)=. bin/tdbtorture$(EXEEXT) clean:: rm -f test.db test.tdb torture.tdb test.gdbm - rm -f $(SONAME) $(SOLIB) libtdb.a libtdb.$(SHLIBEXT) + rm -f $(TDB_SONAME) $(TDB_SOLIB) libtdb.a libtdb.$(SHLIBEXT) rm -f $(ALL_PROGS) tdb.pc build-python:: _tdb.$(SHLIBEXT) @@ -74,13 +74,13 @@ installheaders:: installdirs installlibs:: all installdirs cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig - cp libtdb.a $(SOLIB) $(DESTDIR)$(libdir) + cp libtdb.a $(TDB_SOLIB) $(DESTDIR)$(libdir) libtdb.a: $(TDB_OBJ) ar -rv libtdb.a $(TDB_OBJ) -libtdb.$(SHLIBEXT): $(SOLIB) +libtdb.$(SHLIBEXT): $(TDB_SOLIB) ln -fs $< $@ -$(SONAME): $(SOLIB) +$(TDB_SONAME): $(TDB_SOLIB) ln -fs $< $@ |