[src/trunk]: src/sys/arch/alpha/stand reorganize Makefiles so that warning fl...

[cgd <cgd%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/72048815f46e
branches:  trunk
changeset: 471578:72048815f46e
user:      cgd <cgd%NetBSD.org@localhost>
date:      Mon Apr 05 03:35:24 1999 +0000

description:
reorganize Makefiles so that warning flags aren't accidentally omitted,
and so that all programs and boot blocks are built.

diffstat:

 sys/arch/alpha/stand/Makefile                |  10 +++++++---
 sys/arch/alpha/stand/Makefile.bootprogs      |  17 ++++++++++-------
 sys/arch/alpha/stand/Makefile.inc            |  15 ++++++++-------
 sys/arch/alpha/stand/mkbootimage/Makefile    |  14 +-------------
 sys/arch/alpha/stand/setnetbootinfo/Makefile |  10 +---------
 5 files changed, 27 insertions(+), 39 deletions(-)

diffs (115 lines):

diff -r b9b0f97f2892 -r 72048815f46e sys/arch/alpha/stand/Makefile
--- a/sys/arch/alpha/stand/Makefile     Mon Apr 05 03:33:31 1999 +0000
+++ b/sys/arch/alpha/stand/Makefile     Mon Apr 05 03:35:24 1999 +0000
@@ -1,6 +1,10 @@
-# $NetBSD: Makefile,v 1.11 1999/04/02 09:13:27 cgd Exp $
+# $NetBSD: Makefile,v 1.12 1999/04/05 03:35:24 cgd Exp $
 
-SUBDIR=        boot bootxx installboot mkbootimage netboot setnetbootinfo \
-       bootxx_cd9660 bootxx_ffs ustarboot
+SUBDIR=                installboot mkbootimage setnetbootinfo
+SUBDIR+=       boot bootxx_cd9660 bootxx_ffs netboot ustarboot
+
+# temporary:
+SUBDIR+=       installboot.old
+SUBDIR+=       bootxx
 
 .include <bsd.subdir.mk>
diff -r b9b0f97f2892 -r 72048815f46e sys/arch/alpha/stand/Makefile.bootprogs
--- a/sys/arch/alpha/stand/Makefile.bootprogs   Mon Apr 05 03:33:31 1999 +0000
+++ b/sys/arch/alpha/stand/Makefile.bootprogs   Mon Apr 05 03:35:24 1999 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.bootprogs,v 1.9 1999/04/02 07:55:06 ross Exp $
+# $NetBSD: Makefile.bootprogs,v 1.10 1999/04/05 03:35:24 cgd Exp $
 
 S=     ${.CURDIR}/../../../..
 
 .PATH: ${.CURDIR}/../common
 
-MKMAN= no
 STRIPFLAG=
 BINMODE= 444
 
@@ -24,11 +23,15 @@
 
 all: machine-links ${PROG}
 
-AFLAGS += -DASSEMBLER
-#CPPFLAGS+= -nostdinc -I${.OBJDIR}
-CPPFLAGS+= -I${.OBJDIR}
-CPPFLAGS += -D_STANDALONE -I${.CURDIR}/../.. -I${S}
-CFLAGS = ${CWARNFLAGS} -Os -mno-fp-regs -g
+AFLAGS+=       -DASSEMBLER
+# -I${.CURDIR}/../.. done by Makefile.inc
+CPPFLAGS+=     -nostdinc -I${.OBJDIR} -D_STANDALONE -I${S}
+CFLAGS=                -Os -mno-fp-regs -g
+
+HAVE_GCC28!=   ${CC} --version | egrep "^(2\.8|egcs)" ; echo 
+.if (${HAVE_GCC28} != "")
+CWARNFLAGS+=   -Wno-main
+.endif
 
 # For descriptions of regions available to bootstrap programs, see
 # section 3.4.1.2 (pp. III 3-14 - III 3-18) of the second edition of
diff -r b9b0f97f2892 -r 72048815f46e sys/arch/alpha/stand/Makefile.inc
--- a/sys/arch/alpha/stand/Makefile.inc Mon Apr 05 03:33:31 1999 +0000
+++ b/sys/arch/alpha/stand/Makefile.inc Mon Apr 05 03:35:24 1999 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.13 1998/09/28 21:18:56 thorpej Exp $
+# $NetBSD: Makefile.inc,v 1.14 1999/04/05 03:35:24 cgd Exp $
+
+.include <bsd.own.mk>
 
 BINDIR=                        /usr/mdec
-
-CWARNFLAGS+=   -Wall
+WARNS?=                        1
 
-HAVE_GCC28!=   ${CC} --version | egrep "^(2\.8|egcs)" ; echo 
-.if (${HAVE_GCC28} != "")
-CWARNFLAGS+=   -Wno-main
-.endif
+MKMAN=                 no
+
+CFLAGS+=               -I${.CURDIR}/../..
+LDSTATIC?=             -static
diff -r b9b0f97f2892 -r 72048815f46e sys/arch/alpha/stand/mkbootimage/Makefile
--- a/sys/arch/alpha/stand/mkbootimage/Makefile Mon Apr 05 03:33:31 1999 +0000
+++ b/sys/arch/alpha/stand/mkbootimage/Makefile Mon Apr 05 03:35:24 1999 +0000
@@ -1,17 +1,5 @@
-# $NetBSD: Makefile,v 1.1 1999/04/02 08:40:26 cgd Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.2 1999/04/05 03:35:24 cgd Exp $
 
 PROG=  mkbootimage
-BINDIR=        /usr/mdec
-
-WARNS?=        1
-
-SRCS=  mkbootimage.c
-
-MKMAN= no
-
-CFLAGS+= -I${.CURDIR}/../..
-LDSTATIC?= -static
 
 .include <bsd.prog.mk>
diff -r b9b0f97f2892 -r 72048815f46e sys/arch/alpha/stand/setnetbootinfo/Makefile
--- a/sys/arch/alpha/stand/setnetbootinfo/Makefile      Mon Apr 05 03:33:31 1999 +0000
+++ b/sys/arch/alpha/stand/setnetbootinfo/Makefile      Mon Apr 05 03:35:24 1999 +0000
@@ -1,13 +1,5 @@
-# $NetBSD: Makefile,v 1.9 1999/02/13 02:54:37 lukem Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.10 1999/04/05 03:35:24 cgd Exp $
 
 PROG=  setnetbootinfo
-BINDIR=        /usr/mdec
-
-MKMAN= no
-
-CFLAGS+= -g -I${.CURDIR}/../..
-LDSTATIC?=-static
 
 .include <bsd.prog.mk>