samba-cvs.cvs
[Top] [All Lists]

svn commit: samba r13565 - in trunk/source: .

Subject: svn commit: samba r13565 - in trunk/source: .
From:
Date: Mon, 20 Feb 2006 05:49:28 +0000 GMT
Author: jpeach
Date: 2006-02-20 05:49:27 +0000 (Mon, 20 Feb 2006)
New Revision: 13565

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13565

Log:
svn merge -r13564:13565 ../branches/SAMBA_3_0
Remove trailing backslash. Makes other than GNU make choke on this.

Modified:
   trunk/source/Makefile.in


Changeset:
Modified: trunk/source/Makefile.in
===================================================================
--- trunk/source/Makefile.in    2006-02-20 05:45:09 UTC (rev 13564)
+++ trunk/source/Makefile.in    2006-02-20 05:49:27 UTC (rev 13565)
@@ -589,8 +589,7 @@
 UMOUNT_OBJ = client/smbumount.o
 
 NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(LIBNMB_OBJ) $(RPC_PARSE_OBJ1) 
$(DOSERR_OBJ) \
-               $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(SECRETS_OBJ) 
$(LIBSAMBA_OBJ) \
-               
+               $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(SECRETS_OBJ) 
$(LIBSAMBA_OBJ) 
 
 SMBTORTURE_OBJ1 = torture/torture.o torture/nbio.o torture/scanner.o 
torture/utable.o \
                torture/denytest.o torture/mangle_test.o 

<Prev in Thread] Current Thread [Next in Thread>
  • svn commit: samba r13565 - in trunk/source: ., jpeach <=