[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3135-g058d1e2

[Michael Adam]

The branch, v3-2-test has been updated
       via  058d1e2d0a4985825a62d2adc336a48d91ae4771 (commit)
       via  884349af686faaf7b6bfec08eb2ac5dbc8e30fe5 (commit)
      from  29257fb4a8faf0ccb49dc4dcb6871a145c5b7f21 (commit)

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


- Log -----------------------------------------------------------------
commit 058d1e2d0a4985825a62d2adc336a48d91ae4771
Author: Michael Adam <obnox at samba.org>
Date:   Mon Nov 10 15:01:18 2008 +0100

    build: prevent make errors for picky makes when $(EXTRA_ALL_TARGETS) is empty
    
    picky make implementations don't like lines with only tabs in rules or dependencie
    
    Michael

commit 884349af686faaf7b6bfec08eb2ac5dbc8e30fe5
Author: Martin Schwenke <martin at meltin.net>
Date:   Fri Nov 7 12:20:59 2008 +1100

    Add @CIFSUPCALL_PROGS@ to "all" target so cifs.upcall gets built at
    compile time rather than install time.  This stops problems where
    packaging scripts pass CFLAGS to "make" but not "make install".
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Signed-off-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 source/Makefile.in |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index f5811af..730e130 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -221,7 +221,9 @@ NSS_INFO_MODULES = @NSS_INFO_MODULES@
 MODULES = $(VFS_MODULES) $(PDB_MODULES) $(RPC_MODULES) $(IDMAP_MODULES) \
           $(CHARSET_MODULES) $(AUTH_MODULES) $(NSS_INFO_MODULES)
 
-######################################################################
+EXTRA_ALL_TARGETS = @EXTRA_ALL_TARGETS@
+
+#####################################################################
 # object file lists
 ######################################################################
 
@@ -1093,7 +1095,8 @@ VLP_OBJ = $(VLP_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
 # now the rules...
 ######################################################################
 all:: SHOWFLAGS libs $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
-	$(MODULES) $(NSS_MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@
+	$(MODULES) $(NSS_MODULES) $(PAM_MODULES) @CIFSUPCALL_PROGS@ \
+	$(EXTRA_ALL_TARGETS)
 
 nss_modules:: $(NSS_MODULES)
 


-- 
Samba Shared Repository