[Box Backup-commit] COMMIT r1795 - box/chris/merge/infrastructure

boxbackup-dev@fluffy.co.uk boxbackup-dev@fluffy.co.uk
Tue, 28 Aug 2007 22:33:28 +0100


Author: chris
Date: 2007-08-28 22:33:28 +0100 (Tue, 28 Aug 2007)
New Revision: 1795

Modified:
   box/chris/merge/infrastructure/makebuildenv.pl.in
Log:
Fix quiet-build makefiles to work on BSDs


Modified: box/chris/merge/infrastructure/makebuildenv.pl.in
===================================================================
--- box/chris/merge/infrastructure/makebuildenv.pl.in	2007-08-25 17:00:12 UTC (rev 1794)
+++ box/chris/merge/infrastructure/makebuildenv.pl.in	2007-08-28 21:33:28 UTC (rev 1795)
@@ -544,6 +544,32 @@
 VARIENT = DEBUG
 .endif
 
+__E
+
+	if ($bsd_make)
+	{
+		print MAKE <<__E;
+.ifdef V
+HIDE     = 
+_CXX     = \$(CXX)
+_LINK    = \$(CXX)
+_WINDRES = \$(WINDRES)
+_AR      = \$(AR)
+_RANLIB  = \$(RANLIB)
+.else
+HIDE     = @
+_CXX     = @ echo "[CXX]    " \$(*F) && \$(CXX)
+_LINK    = @ echo "[LINK]   " \$(*F) && \$(CXX)
+_WINDRES = @ echo "[WINDRES]" \$(*F) && \$(WINDRES)
+_AR      = @ echo "[AR]     " \$(*F) && \$(AR)
+_RANLIB  = @ echo "[RANLIB] " \$(*F) && \$(RANLIB)
+.endif
+
+__E
+	}
+	else
+	{
+		print MAKE <<__E;
 HIDE     = \$(if \$(V),,@)
 _CXX     = \$(if \$(V),\$(CXX),     @ echo "[CXX]     \$<" && \$(CXX))
 _LINK    = \$(if \$(V),\$(CXX),     @ echo "[LINK]    \$@" && \$(CXX))
@@ -552,6 +578,7 @@
 _RANLIB  = \$(if \$(V),\$(RANLIB),  @ echo "[RANLIB]  \$@" && \$(RANLIB))
 
 __E
+	}
 	
 	# read directory
 	opendir DIR,$mod;