svn commit: samba r23242 - in branches: SAMBA_3_0/source SAMBA_3_0_25/source SAMBA_3_0_26/source

[jerry at samba.org]

Author: jerry
Date: 2007-05-30 14:53:10 +0000 (Wed, 30 May 2007)
New Revision: 23242

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

Log:
BUG 4671: Fix Makefile syntax error when SMBMOUNT_PROGS is not defined
Modified:
   branches/SAMBA_3_0/source/Makefile.in
   branches/SAMBA_3_0_25/source/Makefile.in
   branches/SAMBA_3_0_26/source/Makefile.in


Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in	2007-05-30 13:41:38 UTC (rev 23241)
+++ branches/SAMBA_3_0/source/Makefile.in	2007-05-30 14:53:10 UTC (rev 23242)
@@ -177,7 +177,8 @@
 	bin/pdbtest at EXEEXT@ bin/talloctort at EXEEXT@ bin/replacetort at EXEEXT@ \
 	bin/tdbtorture at EXEEXT@
 
-BIN_PROGS = $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4) @EXTRA_BIN_PROGS@ @SMBMOUNT_PROGS@
+BIN_PROGS = @EXTRA_BIN_PROGS@ @SMBMOUNT_PROGS@ \
+	$(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4) 
 
 EVERYTHING_PROGS = bin/debug2html at EXEEXT@ bin/smbfilter at EXEEXT@ \
 	bin/talloctort at EXEEXT@ bin/replacetort at EXEEXT@ \

Modified: branches/SAMBA_3_0_25/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0_25/source/Makefile.in	2007-05-30 13:41:38 UTC (rev 23241)
+++ branches/SAMBA_3_0_25/source/Makefile.in	2007-05-30 14:53:10 UTC (rev 23242)
@@ -162,8 +162,8 @@
 	bin/locktest2 at EXEEXT@ bin/nsstest at EXEEXT@ bin/vfstest at EXEEXT@ \
 	bin/pdbtest at EXEEXT@ bin/talloctort at EXEEXT@ bin/replacetort at EXEEXT@
 
-BIN_PROGS = $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) @EXTRA_BIN_PROGS@ \
-	@SMBMOUNT_PROGS@
+BIN_PROGS = @SMBMOUNT_PROGS@ @EXTRA_BIN_PROGS@ \
+	$(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3)
 
 EVERYTHING_PROGS = bin/debug2html at EXEEXT@ bin/smbfilter at EXEEXT@ \
 	bin/talloctort at EXEEXT@ bin/replacetort at EXEEXT@ \

Modified: branches/SAMBA_3_0_26/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0_26/source/Makefile.in	2007-05-30 13:41:38 UTC (rev 23241)
+++ branches/SAMBA_3_0_26/source/Makefile.in	2007-05-30 14:53:10 UTC (rev 23242)
@@ -167,8 +167,8 @@
 	bin/locktest2 at EXEEXT@ bin/nsstest at EXEEXT@ bin/vfstest at EXEEXT@ \
 	bin/pdbtest at EXEEXT@ bin/talloctort at EXEEXT@ bin/replacetort at EXEEXT@
 
-BIN_PROGS = $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) @EXTRA_BIN_PROGS@ \
-	@SMBMOUNT_PROGS@
+BIN_PROGS = @SMBMOUNT_PROGS@ @EXTRA_BIN_PROGS@ \
+	$(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3)
 
 EVERYTHING_PROGS = bin/debug2html at EXEEXT@ bin/smbfilter at EXEEXT@ \
 	bin/talloctort at EXEEXT@ bin/replacetort at EXEEXT@ \