[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4087-gc3d1b00

[Jelmer Vernooij]

The branch, v3-devel has been updated
       via  c3d1b0097590566417bda3fa33a64e994c9c7526 (commit)
       via  151c78652a89146049a134f60aef509c2117c436 (commit)
       via  c77758de5d6df28abaffe3f8a1d7b5cbc615605e (commit)
      from  ab41017896e08d32c8a87bf172654ff2db6b6f1a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel


- Log -----------------------------------------------------------------
commit c3d1b0097590566417bda3fa33a64e994c9c7526
Merge: 151c78652a89146049a134f60aef509c2117c436 ab41017896e08d32c8a87bf172654ff2db6b6f1a
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Sep 9 19:27:00 2008 +0200

    Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel

commit 151c78652a89146049a134f60aef509c2117c436
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Sep 9 19:05:48 2008 +0200

    Stop ignoring .svn directories when creating tags, since we no longer use
    svn.

commit c77758de5d6df28abaffe3f8a1d7b5cbc615605e
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Sep 9 19:03:49 2008 +0200

    Rename object variables to avoid clashes with Samba 4.

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

Summary of changes:
 source/Makefile.in  |    8 ++++----
 source/configure.in |   10 ++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index c4ccf72..e0f390c 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -230,7 +230,7 @@ MODULES = $(VFS_MODULES) $(PDB_MODULES) $(RPC_MODULES) $(IDMAP_MODULES) \
 # object file lists
 ######################################################################
 
-TDB_OBJ = lib/util_tdb.o \
+TDB_LIB_OBJ = lib/util_tdb.o \
 	  lib/dbwrap.o lib/dbwrap_tdb.o \
 	  lib/dbwrap_ctdb.o \
 	  lib/dbwrap_rbt.o @LIBTDB_STATIC@
@@ -318,7 +318,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) \
 	  lib/interfaces.o lib/rbtree.o lib/memcache.o \
 	  lib/util_transfer_file.o lib/async_req.o \
 	  lib/async_sock.o \
-	  $(TDB_OBJ) \
+	  $(TDB_LIB_OBJ) \
 	  $(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \
 	  lib/interface.o lib/md4.o \
 	  lib/pidfile.o \
@@ -2634,10 +2634,10 @@ proto::
 .PHONY: proto
 
 etags:
-	etags `find $(srcdir) -name "*.[ch]" | grep -v /.svn/`
+	etags `find $(srcdir) -name "*.[ch]"`
 
 ctags:
-	ctags `find $(srcdir) -name "*.[ch]" | grep -v /.svn/`
+	ctags `find $(srcdir) -name "*.[ch]"`
 
 realclean:: clean
 	-rm -f config.log bin/.dummy script/findsmb script/gen-8bit-gap.sh
diff --git a/source/configure.in b/source/configure.in
index a729223..f813e87 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -37,12 +37,14 @@ tdbdir="lib/tdb"
 AC_SUBST(tdbdir)
 TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include"
 AC_SUBST(TDB_CFLAGS)
-TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o"
-TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o"
-AC_SUBST(TDB_OBJ)
 
 LIBTDB_OBJ0=""
-for o in $TDB_OBJ; do LIBTDB_OBJ0="$LIBTDB_OBJ0 lib/tdb/$o"; done
+for o in common/tdb.o common/dump.o common/transaction.o common/error.o \
+	     common/traverse.o common/freelist.o common/freelistcheck.o \
+		 common/io.o common/lock.o common/open.o; 
+do 
+	LIBTDB_OBJ0="$LIBTDB_OBJ0 lib/tdb/$o"
+done
 
 AC_SUBST(LIBTDB_OBJ0)
 SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"


-- 
Samba Shared Repository