[SCM] Samba Shared Repository - branch master updated - 84e37eb5f56e2979cae89b96bc25ae746d7efab9

Michael Adam obnox at samba.org
Sat Nov 22 22:29:37 GMT 2008


The branch, master has been updated
       via  84e37eb5f56e2979cae89b96bc25ae746d7efab9 (commit)
      from  a6aa72001e3fdd36112a839cf3e40dd2d636f254 (commit)

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


- Log -----------------------------------------------------------------
commit 84e37eb5f56e2979cae89b96bc25ae746d7efab9
Author: Michael Adam <obnox at samba.org>
Date:   Sat Nov 22 23:25:14 2008 +0100

    s3 build: don't specify ZLIB_LIBS (i.e. "-lz") in object collections.
    
    This causes make to fail on at least HP-UX and MacOS X with message
    "no rule to make target -lz" or similar, when these object collections
    are specified in dependencies.
    
    Michael

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

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


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4a0590c..8498447 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -931,7 +931,7 @@ SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) \
 
 MASKTEST_OBJ = torture/masktest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
                  $(LIB_NONSMBD_OBJ) \
-		 $(LIBNDR_GEN_OBJ0) $(ZLIB_LIBS)
+		 $(LIBNDR_GEN_OBJ0)
 
 MSGTEST_OBJ = torture/msgtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
                  $(LIB_NONSMBD_OBJ) \
@@ -939,7 +939,7 @@ MSGTEST_OBJ = torture/msgtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
 
 LOCKTEST_OBJ = torture/locktest.o $(PARAM_OBJ) $(LOCKING_OBJ) $(KRBCLIENT_OBJ) \
                $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \
-               $(LIBNDR_GEN_OBJ0) $(ZLIB_LIBS)
+               $(LIBNDR_GEN_OBJ0)
 
 NSSTEST_OBJ = torture/nsstest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
                  $(LIB_NONSMBD_OBJ) \
@@ -958,7 +958,7 @@ LOG2PCAP_OBJ = utils/log2pcaphex.o
 
 LOCKTEST2_OBJ = torture/locktest2.o $(PARAM_OBJ) $(LOCKING_OBJ) $(LIBSMB_OBJ) \
 		$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
-		$(LIBNDR_GEN_OBJ0) $(ZLIB_LIBS)
+		$(LIBNDR_GEN_OBJ0)
 
 SMBCACLS_OBJ = utils/smbcacls.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
 		$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \


-- 
Samba Shared Repository


More information about the samba-cvs mailing list