Kconfig compiled clean.

tools/kconfig/Makefile

@@ -1,12 +1,17 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+CC		= gcc -g
+CFLAGS		= -O -Wall
+YACC            = byacc -d
+DESTDIR		= /usr/local
+OBJS            = config.o main.o lang.o mkioconf.o mkmakefile.o mkglue.o mkheaders.o \
+                  mkswapconf.o
+PROG		= kconfig
 
-PROG=	config
+all:		$(PROG)
-CFLAGS+=-I. -I${.CURDIR}
-SRCS=	config.c main.c lang.c mkioconf.c mkmakefile.c mkglue.c mkheaders.c \
-	mkswapconf.c
-MAN8=	config.0
-DPADD=	${LIBL}
-LDADD=	-ll
-CLEANFILES+=y.tab.h lang.c config.c y.tab.c config.0
 
-.include <local.prog.mk>
+install:	$(PROG)
+		install -s $(PROG) ${DESTDIR}/bin/$(PROG)
+clean:
+		rm -rf *~ *.o *.lst *.dis $(PROG) $(PROG).dSYM y.tab.[ch] lang.c config.c
+
+$(PROG):	$(OBJS)
+		$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)

tools/kconfig/Makefile-bsd

@@ -0,0 +1,12 @@
+#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+
+PROG=	config
+CFLAGS+=-I. -I${.CURDIR}
+SRCS=	config.c main.c lang.c mkioconf.c mkmakefile.c mkglue.c mkheaders.c \
+	mkswapconf.c
+MAN8=	config.0
+DPADD=	${LIBL}
+LDADD=	-ll
+CLEANFILES+=y.tab.h lang.c config.c y.tab.c config.0
+
+.include <local.prog.mk>

tools/kconfig/config.y

@@ -709,7 +709,6 @@ void mkswap(system, fl, size, flag)
 	int size, flag;
 {
 	register struct file_list **flp;
-	char name[80];
 
 	if (system == 0 || system->f_type != SYSTEMSPEC) {
 		yyerror("\"swap\" spec precedes \"config\" specification");
@@ -765,7 +764,6 @@ void addcomp(compdev, fl)
 	struct file_list *compdev, *fl;
 {
 	register struct file_list **flp;
-	char name[80];
 
 	if (compdev == 0 || compdev->f_type != COMPDEVICE) {
 		yyerror("component spec precedes device specification");

tools/kconfig/lang.l

@@ -1,3 +1,6 @@
+%option noinput
+%option nounput
+%option noyywrap
 %{
 /*-
  * Copyright (c) 1980, 1993

tools/kconfig/main.c

@@ -30,17 +30,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/file.h>

tools/kconfig/mkglue.c

@@ -31,10 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)mkglue.c	8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
-
 /*
  * Make the bus adaptor interrupt glue files.
  */
@@ -331,13 +327,16 @@ void vbglue()
  * HP9000/300 interrupts are auto-vectored.
  * Code is hardwired in locore.s
  */
-void hpglue() {}
+void hpglue()
+{
+}
 
 /*
  * Create the ISA interrupt vector glue file.
  */
-void vector() {
+void vector()
-	register FILE *fp, *gp;
+{
+	register FILE *fp;
 	register struct device *dp, *mp;
 	int count;
 

tools/kconfig/mkheaders.c

@@ -31,10 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)mkheaders.c	8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
-
 /*
  * Make all the .h files for the optional entries
  */

tools/kconfig/mkioconf.c

@@ -31,10 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)mkioconf.c	8.2 (Berkeley) 1/21/94";
-#endif /* not lint */
-
 #include <stdio.h>
 #include "y.tab.h"
 #include "config.h"
@@ -604,8 +600,7 @@ char *sirq(int);
 
 void i386_ioconf()
 {
-	register struct device *dp, *mp, *np;
+	register struct device *dp, *mp;
-	register int uba_n, slave;
 	FILE *fp;
 
 	fp = fopen(path("ioconf.c"), "w");

tools/kconfig/mkmakefile.c

@@ -31,10 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)mkmakefile.c	8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
-
 /*
  * Build the makefile for the system, from
  * the information in the files files and the
@@ -157,7 +153,7 @@ void read_files()
 	FILE *fp;
 	register struct file_list *tp, *pf;
 	register struct device *dp;
-	struct device *save_dp;
+	struct device *save_dp = 0;
 	register struct opt *op;
 	char *wd, *this, *needs, *special;
 	char fname[32];
@@ -267,6 +263,7 @@ nextparam:
 		dp->d_name = ns(wd);
 		dp->d_type = PSEUDO_DEVICE;
 		dp->d_slave = 1;
+		if (save_dp)
                         save_dp->d_next = dp;
 		goto nextparam;
 	}
@@ -297,7 +294,6 @@ doneparam:
 		exit(1);
 	}
 
-save:
 	if (wd) {
 		printf("%s: syntax error describing %s\n",
 		    fname, this);
@@ -406,7 +402,7 @@ void do_cfiles(fp)
 void do_rules(f)
 	FILE *f;
 {
-	register char *cp, *np, och, *tp;
+	register char *cp, *np, och;
 	register struct file_list *ftp;
 	char *special;
 
@@ -421,7 +417,6 @@ void do_rules(f)
 			continue;
 		}
 		fprintf(f, "%so: $S/%s%c\n", tail(np), np, och);
-		tp = tail(np);
 		special = ftp->f_special;
 		if (special == 0) {
 			char *ftype;

tools/kconfig/mkswapconf.c

@@ -31,10 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)mkswapconf.c	8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
-
 /*
  * Build a swap configuration file.
  */

tools/kconfig/mkubglue.c

@@ -31,10 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)mkubglue.c	8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
-
 /*
  * Make the uba interrupt file ubglue.s
  */