[SCM] CTDB repository - branch master updated - ctdb-1.11-1-g9118b9c

Ronnie Sahlberg sahlberg at samba.org
Thu Sep 1 21:46:13 MDT 2011


The branch, master has been updated
       via  9118b9cf1634866266fbf0a9bf857a622f994a1a (commit)
      from  ee9bf1565383bcca70950e9c20fe6b4d0181ce8d (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9118b9cf1634866266fbf0a9bf857a622f994a1a
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Fri Sep 2 13:21:33 2011 +1000

    tests: Link ctdb_fetch_lock_once with @TDB_OBJ@ not -ltdb so we dont create an unneeded dependency on having a standalone tdb library installed

-----------------------------------------------------------------------

Summary of changes:
 Makefile.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/Makefile.in b/Makefile.in
index 02e1d0a..d652a92 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -167,9 +167,9 @@ tests/bin/ctdb_fetch_one: $(CTDB_CLIENT_OBJ) tests/src/ctdb_fetch_one.o
 	@echo Linking $@
 	@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_one.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
 
-tests/bin/ctdb_fetch_lock_once: libctdb/libctdb.a tests/src/ctdb_fetch_lock_once.o 
+tests/bin/ctdb_fetch_lock_once: libctdb/libctdb.a tests/src/ctdb_fetch_lock_once.o @TDB_OBJ@
 	@echo Linking $@
-	@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_lock_once.o libctdb/libctdb.a -ltdb $(LIB_FLAGS)
+	@$(CC) $(CFLAGS) -o $@ @TDB_OBJ@ tests/src/ctdb_fetch_lock_once.o libctdb/libctdb.a $(LIB_FLAGS)
 
 tests/bin/ctdb_store: $(CTDB_CLIENT_OBJ) tests/src/ctdb_store.o 
 	@echo Linking $@


-- 
CTDB repository


More information about the samba-cvs mailing list