Recover improvements in 4.4lite version that were clobbered by the

previous commit:
+ Everything is initialized using ?= instead of =.
+ Nicer formatting (more white space).
+ .c: rule.

Add macros ECHO and ECHODIR.  Both are normally `echo', but when
the make flags include -s, ECHO is set to `true' and when the make
flags include two or more -s's ECHODIR is set to `true'.  @${ECHO}
should be used instead of @echo in most cases.  ${ECHODIR} is
intended to be used mainly for messages about directory names.

1 files changed, 50 insertions, 30 deletions

diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 154bd51..3835808 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,52 +1,72 @@
-#	from: @(#)sys.mk	5.11 (Berkeley) 3/13/91
-#	$Id: sys.mk,v 1.7 1994/06/13 21:02:48 csgr Exp $
+#	from: @(#)sys.mk	8.2 (Berkeley) 3/21/94
+#	$Id: sys.mk,v 1.2 1994/08/04 21:09:27 wollman Exp $
 
-unix=		We run FreeBSD, not UNIX.
+unix		?=	We run FreeBSD, not UNIX.
 
 .SUFFIXES: .out .a .ln .o .c .cc .cxx .C .F .f .e .r .y .l .s .cl .p .h 
 
 .LIBS:		.a
 
-AR=		ar
-ARFLAGS=	rl
-RANLIB=		ranlib
+AR		?=	ar
+ARFLAGS		?=	rl
+RANLIB		?=	ranlib
 
-AS=		as
-AFLAGS=
+AS		?=	as
+AFLAGS		?=
 
-CC=		cc
-CFLAGS=		-O
+CC		?=	cc
 
-CXX=		g++
-CXXFLAGS=	${CXXINCLUDES} ${CFLAGS}
+.if ${MACHINE} == "sparc"
+CFLAGS		?=	-O4
+.else
+CFLAGS		?=	-O
+.endif
+
+CXX		?=	g++
+CXXFLAGS	?=	${CXXINCLUDES} ${CFLAGS}
+
+CPP		?=	cpp
+
+.if ${.MAKEFLAGS:M-s} == ""
+ECHO		?=	echo
+ECHODIR		?=	echo
+.else
+ECHO		?=	true
+.if ${.MAKEFLAGS:M-s} == "-s"
+ECHODIR		?=	echo
+.else
+ECHODIR		?=	true
+.endif
+.endif
 
-CPP=		cpp
+FC		?=	f77
+FFLAGS		?=	-O
+EFLAGS		?=
 
-FC=		f77
-FFLAGS=		-O
-EFLAGS=
+LEX		?=	lex
+LFLAGS		?=
 
-LEX=		lex
-LFLAGS=
+LD		?=	ld
+LDFLAGS		?=
 
-LD=		ld
-LDFLAGS=
+LINT		?=	lint
+LINTFLAGS	?=	-chapbx
 
-LINT=		lint
-LINTFLAGS=	-chapbx
+MAKE		?=	make
 
-MAKE=		make
+PC		?=	pc
+PFLAGS		?=
 
-PC=		pc
-PFLAGS=
+RC		?=	f77
+RFLAGS		?=
 
-RC=		f77
-RFLAGS=
+SHELL		?=	sh
 
-SHELL=		sh
+YACC		?=	yacc
+YFLAGS		?=	-d
 
-YACC=		yacc
-YFLAGS=-d
+.c:
+	${CC} ${CFLAGS} ${.IMPSRC} -o ${.TARGET}
 
 .c.o:
 	${CC} ${CFLAGS} -c ${.IMPSRC}