PR/5577: Craig M. Chase: sh does not build with PARALLEL set.

- Added YHEADER in Makefile, removed arith.h and adjusted the sources.

bin/sh/Makefile

@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.46 1998/10/08 00:29:38 ross Exp $
+#	$NetBSD: Makefile,v 1.47 1999/02/05 07:52:51 christos Exp $
 #	@(#)Makefile	8.4 (Berkeley) 5/5/95
 
+YHEADER=1
 PROG=	sh
 SHSRCS=	alias.c cd.c echo.c error.c eval.c exec.c expand.c \
 	histedit.c input.c jobs.c mail.c main.c memalloc.c miscbltin.c \

bin/sh/arith.h

@@ -1,41 +0,0 @@
-/*	$NetBSD: arith.h,v 1.2 1997/07/04 21:01:49 christos Exp $	*/
-
-/*-
- * Copyright (c) 1995
- *      The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)arith.h	1.1 (Berkeley) 5/4/95
- */
-
-int arith __P((char *));
-int expcmd __P((int , char **));
-void arith_lex_reset __P((void));
-int yylex __P((void));

bin/sh/arith.y

@@ -1,5 +1,5 @@
 %{
-/*	$NetBSD: arith.y,v 1.11 1998/07/28 11:41:52 mycroft Exp $	*/
+/*	$NetBSD: arith.y,v 1.12 1999/02/05 07:52:52 christos Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -42,12 +42,12 @@
 #if 0
 static char sccsid[] = "@(#)arith.y	8.3 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: arith.y,v 1.11 1998/07/28 11:41:52 mycroft Exp $");
+__RCSID("$NetBSD: arith.y,v 1.12 1999/02/05 07:52:52 christos Exp $");
 #endif
 #endif /* not lint */
 
 #include <stdlib.h>
-#include "arith.h"
+#include "expand.h"
 #include "shell.h"
 #include "error.h"
 #include "output.h"

bin/sh/arith_lex.l

@@ -1,5 +1,5 @@
 %{
-/*	$NetBSD: arith_lex.l,v 1.9 1998/05/18 22:50:20 christos Exp $	*/
+/*	$NetBSD: arith_lex.l,v 1.10 1999/02/05 07:52:52 christos Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -42,14 +42,14 @@
 #if 0
 static char sccsid[] = "@(#)arith_lex.l	8.3 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: arith_lex.l,v 1.9 1998/05/18 22:50:20 christos Exp $");
+__RCSID("$NetBSD: arith_lex.l,v 1.10 1999/02/05 07:52:52 christos Exp $");
 #endif
 #endif /* not lint */
 
 #include <unistd.h>
-#include "y.tab.h"
-#include "error.h"
 #include "arith.h"
+#include "error.h"
+#include "expand.h"
 
 extern int yylval;
 extern char *arith_buf, *arith_startbuf;

bin/sh/expand.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: expand.c,v 1.42 1999/01/25 14:20:56 mycroft Exp $	*/
+/*	$NetBSD: expand.c,v 1.43 1999/02/05 07:52:52 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)expand.c	8.5 (Berkeley) 5/15/95";
 #else
-__RCSID("$NetBSD: expand.c,v 1.42 1999/01/25 14:20:56 mycroft Exp $");
+__RCSID("$NetBSD: expand.c,v 1.43 1999/02/05 07:52:52 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -75,7 +75,6 @@ __RCSID("$NetBSD: expand.c,v 1.42 1999/01/25 14:20:56 mycroft Exp $");
 #include "memalloc.h"
 #include "error.h"
 #include "mystring.h"
-#include "arith.h"
 #include "show.h"
 
 /*

bin/sh/expand.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: expand.h,v 1.9 1998/01/31 12:45:07 christos Exp $	*/
+/*	$NetBSD: expand.h,v 1.10 1999/02/05 07:52:52 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -67,3 +67,9 @@ void expari __P((int));
 int patmatch __P((char *, char *));
 void rmescapes __P((char *));
 int casematch __P((union node *, char *));
+
+/* From arith.y */
+int arith __P((char *));
+int expcmd __P((int , char **));
+void arith_lex_reset __P((void));
+int yylex __P((void));