[Pkg-samba-maint] r2560 - branches/samba/backports/lenny/debian/patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2009-02-08 06:41:16 +0000 (Sun, 08 Feb 2009)
New Revision: 2560

Modified:
   branches/samba/backports/lenny/debian/patches/shrink-dead-code.patch
Log:
FIx broken patch that prevents compiling


Modified: branches/samba/backports/lenny/debian/patches/shrink-dead-code.patch
===================================================================
--- branches/samba/backports/lenny/debian/patches/shrink-dead-code.patch	2009-02-07 12:15:27 UTC (rev 2559)
+++ branches/samba/backports/lenny/debian/patches/shrink-dead-code.patch	2009-02-08 06:41:16 UTC (rev 2560)
@@ -55,7 +55,7 @@
  
  bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@ @LIBNETAPI_SHARED@
  	@echo Linking $@
-@@ -1306,220 +1316,297 @@
+@@ -1306,220 +1316,295 @@
  
  bin/profiles at EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
  	@echo Linking $@
@@ -99,7 +99,7 @@
  
  bin/testparm at EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
  	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
+-	@$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
 +	@$(AR) -rc $@.a $(TESTPARM_OBJ)
 +	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) $(LIBS) \
  		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
@@ -116,9 +116,9 @@
  bin/smbcontrol at EXEEXT@: $(BINARY_PREREQS) $(SMBCONTROL_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
  	@echo Linking $@
 -	@$(CC) -DUSING_SMBCONTROL $(FLAGS) -o $@ \
+-		$(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \
 +	@$(AR) -rc $@.a $(SMBCONTROL_OBJ)
 +	@$(CC) -DUSING_SMBCONTROL $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
- 		$(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \
  		$(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ $(POPT_LIBS) \
  		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 +	@rm -f $@.a
@@ -390,7 +390,7 @@
  
  
  #####################################################################
-@@ -2100,16 +2187,20 @@
+@@ -2100,16 +2185,20 @@
  
  bin/winbindd at EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
  	@echo "Linking $@"
@@ -413,7 +413,7 @@
  
  @WINBIND_NSS@: $(BINARY_PREREQS) $(WINBIND_NSS_OBJ)
  	@echo "Linking $@"
-@@ -2359,9 +2450,11 @@
+@@ -2359,9 +2448,11 @@
  
  bin/wbinfo at EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
  	@echo Linking $@
@@ -426,7 +426,7 @@
  
  bin/ntlm_auth at EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \
  	$(LIB_NONSMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
-@@ -2379,23 +2472,31 @@
+@@ -2379,23 +2470,31 @@
  
  bin/tdbbackup at EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
  	@echo Linking $@