The branch, v3-3-test has been updated
via a0e471fc3be0f8c9c66a6c0f242515e61d1301a5 (commit)
via d58e6cb2467551f61f937d8bc16a7e0a765d8273 (commit)
from a982abf3899199faef11b7279d1d5080e8a9f71c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit a0e471fc3be0f8c9c66a6c0f242515e61d1301a5
Author: Michael Adam <[EMAIL PROTECTED]>
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
(cherry picked from commit 058d1e2d0a4985825a62d2adc336a48d91ae4771)
commit d58e6cb2467551f61f937d8bc16a7e0a765d8273
Author: Martin Schwenke <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
Signed-off-by: Michael Adam <[EMAIL PROTECTED]>
(cherry picked from commit 884349af686faaf7b6bfec08eb2ac5dbc8e30fe5)
-----------------------------------------------------------------------
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 448a413..a203e6a 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -226,7 +226,9 @@ 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
######################################################################
@@ -1131,7 +1133,8 @@ RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \
# 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
