[SCM] Samba Shared Repository - branch master updated - 8fe59b9b00072dc4e12314624bbb692ceb776efd

[Jelmer Vernooij]

The branch, master has been updated
       via  8fe59b9b00072dc4e12314624bbb692ceb776efd (commit)
       via  3678a98dcdb6267e0279b638d7008acfa3a0ee8b (commit)
      from  febd55b1bfb3a93d905bb1a1903fc28e88d2a497 (commit)

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


- Log -----------------------------------------------------------------
commit 8fe59b9b00072dc4e12314624bbb692ceb776efd
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Oct 21 16:04:54 2008 +0200

    Automatically enable merged build (for more complete 'make test') when possible during developer builds.

commit 3678a98dcdb6267e0279b638d7008acfa3a0ee8b
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Oct 21 16:03:45 2008 +0200

    Remove duplicate searching of Samba 4 directory for tags.

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

Summary of changes:
 source3/configure.in |    5 ++++-
 source3/samba4.mk    |    8 --------
 2 files changed, 4 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index a97d535..cd84934 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6236,7 +6236,10 @@ if test x$enable_merged_build = xauto; then
 	AC_MSG_CHECKING([whether it would be possible to do a merged build])
 	AC_MSG_RESULT([$merged_build_possible])
 
-	dnl FIXME: enable_merged_build=$merged_build_possible
+	# Enable merged build automatically if possible, when in developer mode
+	if test "x$developer" = xyes; then
+		enable_merged_build=$merged_build_possible
+	fi
 fi
 
 if test x$enable_merged_build = xyes; then
diff --git a/source3/samba4.mk b/source3/samba4.mk
index 93022c5..27fb210 100644
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -161,11 +161,3 @@ modules:: $(PLUGINS)
 all:: basics bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4
 torture:: basics bin/smbtorture4
 everything:: basics $(patsubst %,%4,$(BINARIES))
-
-
-etags::
-	etags --append=yes `find $(samba4srcdir) -name "*.[ch]"`
-
-ctags::
-	ctags --append=yes `find $(samba4srcdir) -name "*.[ch]"`
-


-- 
Samba Shared Repository