[SCM] Samba Shared Repository - branch master updated - 951cf45ee7014e4099adf4efdfbb6eb71d7e8419

[Michael Adam]

The branch, master has been updated
       via  951cf45ee7014e4099adf4efdfbb6eb71d7e8419 (commit)
       via  4c391c94f47458a64bf71d17fc3d7c0507ebfd9b (commit)
      from  7d8787c915b97f44851d2ca4c854c5f3aca8a3c6 (commit)

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


- Log -----------------------------------------------------------------
commit 951cf45ee7014e4099adf4efdfbb6eb71d7e8419
Author: Michael Adam <obnox at samba.org>
Date:   Mon Nov 10 15:13:15 2008 +0100

    [s3]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 4c391c94f47458a64bf71d17fc3d7c0507ebfd9b
Author: Michael Adam <obnox at samba.org>
Date:   Mon Nov 10 15:10:37 2008 +0100

    [s3]build: build cifs.upcall at build time instead of at install time.
    
    This is to prevent problems with packaging scripts that pass CFLAGS
    to make but not to make install...
    
    Based on a patch for v3-2 by Martin Schwenke <martin at meltin.net>.
    
    Michael

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

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


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index a644eea..d216e1c 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -224,6 +224,8 @@ MODULES = $(VFS_MODULES) $(PDB_MODULES) $(RPC_MODULES) $(IDMAP_MODULES) \
           $(CHARSET_MODULES) $(AUTH_MODULES) $(NSS_INFO_MODULES) \
 	  $(GPEXT_MODULES)
 
+EXTRA_ALL_TARGETS = @EXTRA_ALL_TARGETS@
+
 ######################################################################
 # object file lists
 ######################################################################
@@ -1158,7 +1160,8 @@ RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \
 # now the rules...
 ######################################################################
 all:: SHOWFLAGS basics 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)
 
 basics::
 


-- 
Samba Shared Repository