The branch, master has been updated
via ad240e199893a5e89cdd5161134171cc600266b8 (commit)
from 6d82b5975598f1742c53ebdaa2fa89f7cf148b85 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ad240e199893a5e89cdd5161134171cc600266b8
Author: Michael Adam <ob...@samba.org>
Date: Fri May 15 11:58:17 2009 +0200
s3:build: rename OBJ collection for dbwrap_tool consistently
Michael
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4447da9..72692dd 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1217,10 +1217,10 @@ RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \
../librpc/rpc/binding.o \
$(LIBMSRPC_GEN_OBJ)
-DBWRAP_STORE_INT32_OBJ = utils/dbwrap_tool.o \
- $(PARAM_OBJ) \
- $(LIB_NONSMBD_OBJ) \
- $(LIBSAMBA_OBJ)
+DBWRAP_TOOL_OBJ = utils/dbwrap_tool.o \
+ $(PARAM_OBJ) \
+ $(LIB_NONSMBD_OBJ) \
+ $(LIBSAMBA_OBJ)
######################################################################
# now the rules...
@@ -2870,9 +2870,9 @@ bin/test_lp_l...@exeext@: $(BINARY_PREREQS)
$(TEST_LP_LOAD_OBJ) @BUILD_POPT@ @LI
$(LDAP_LIBS) \
$(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-bin/dbwrap_t...@exeext@: $(DBWRAP_STORE_INT32_OBJ) @LIBTALLOC_TARGET@
@LIBTDB_TARGET@
+bin/dbwrap_t...@exeext@: $(DBWRAP_TOOL_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
@echo "Linking $@"
- @$(CC) -o $@ $(DBWRAP_STORE_INT32_OBJ)\
+ @$(CC) -o $@ $(DBWRAP_TOOL_OBJ)\
$(LDFLAGS) $(DYNEEXP) $(LIBS) \
$(LDAP_LIBS) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
--
Samba Shared Repository
