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

[Jelmer Vernooij]

The branch, v3-devel has been updated
       via  3f821e8c88665a1e6a3d07a438cd978527306221 (commit)
       via  7eb6bfca40d9ecc225e40661093697edd07699e6 (commit)
      from  98b2fbef5273b055242e24490736b0c9677b1732 (commit)

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


- Log -----------------------------------------------------------------
commit 3f821e8c88665a1e6a3d07a438cd978527306221
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Sep 4 23:43:58 2008 +0200

    Use different variable names for talloc and tdb object file names than
    Samba 4.

commit 7eb6bfca40d9ecc225e40661093697edd07699e6
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Sep 4 23:05:48 2008 +0200

    Ignore unused pidl-generated files.

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

Summary of changes:
 .gitignore          |   10 ++++++++++
 source/Makefile.in  |    5 ++---
 source/configure.in |   14 ++++++--------
 3 files changed, 18 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index edb1b3d..123e925 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,13 @@ source/librpc/gen_ndr/srv_misc.*
 source/librpc/gen_ndr/srv_notify.*
 source/librpc/gen_ndr/srv_security.*
 source/librpc/gen_ndr/srv_xattr.*
+source/librpc/gen_ndr/cli_libnetapi.c
+source/librpc/gen_ndr/cli_libnetapi.h
+source/librpc/gen_ndr/cli_nbt.c
+source/librpc/gen_ndr/cli_nbt.h
+source/librpc/gen_ndr/srv_drsuapi.c
+source/librpc/gen_ndr/srv_drsuapi.h
+source/librpc/gen_ndr/srv_libnetapi.c
+source/librpc/gen_ndr/srv_libnetapi.h
+source/librpc/gen_ndr/srv_nbt.c
+source/librpc/gen_ndr/srv_nbt.h
diff --git a/source/Makefile.in b/source/Makefile.in
index 5793b5e..c4ccf72 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1560,9 +1560,8 @@ MKSYMS_SH = $(srcdir)/script/mksyms.sh
 #
 #-------------------------------------------------------------------
 
-TALLOC_OBJ = @TALLOC_OBJS@
 
-LIBTALLOC_OBJ0 = $(TALLOC_OBJ)
+LIBTALLOC_OBJ0 = @LIBTALLOC_OBJ0@
 LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ)
 
 LIBTALLOC_SHARED_TARGET=@LIBTALLOC_SHARED_TARGET@
@@ -1627,7 +1626,7 @@ shlibs test_shlibs: @LIBTALLOC_SHARED@
 #
 #-------------------------------------------------------------------
 
-LIBTDB_OBJ0 = @TDB_OBJS@
+LIBTDB_OBJ0 = @LIBTDB_OBJ0@
 LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ)
 
 LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@
diff --git a/source/configure.in b/source/configure.in
index bc5a827..81f41c1 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -25,11 +25,11 @@ AC_LIBREPLACE_CC_CHECKS
 
 m4_include(lib/talloc/libtalloc.m4)
 
-TALLOC_OBJS=""
+LIBTALLOC_OBJ0=""
 for obj in ${TALLOC_OBJ}; do
-	TALLOC_OBJS="${TALLOC_OBJS} ${tallocdir}/${obj}"
+	LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}"
 done
-AC_SUBST(TALLOC_OBJS)
+AC_SUBST(LIBTALLOC_OBJ0)
 
 # TODO: These should come from m4_include(lib/tdb/libtdb.m4)
 # but currently this fails: things have to get merged from s4.
@@ -41,12 +41,10 @@ TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/t
 TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o"
 AC_SUBST(TDB_OBJ)
 
-TDB_OBJS=""
-for obj in ${TDB_OBJ}; do
-	TDB_OBJS="${TDB_OBJS} ${tdbdir}/${obj}"
-done
-AC_SUBST(TDB_OBJS)
+LIBTDB_OBJ0=""
+for o in $TDB_OBJ; do LIBTDB_OBJ0="$LIBTDB_OBJ0 lib/tdb/$o"; done
 
+AC_SUBST(LIBTDB_OBJ0)
 SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/replace"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"


-- 
Samba Shared Repository