Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Actually, punt the `library' keyword; it does the same thing as `object', 

and we really only need one of them.
This commit is contained in:
mycroft 1997-10-10 10:41:18 +00:00
parent 7c9cfab805
commit e8f7fd90c1
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.sbin/config/gram.y
View File

@ -1,5 +1,5 @@
%{
/* $NetBSD: gram.y,v 1.17 1997/10/10 10:27:55 mycroft Exp $ */
/* $NetBSD: gram.y,v 1.18 1997/10/10 10:41:18 mycroft Exp $ */
/*
* Copyright (c) 1992, 1993
@ -100,7 +100,7 @@ static void check_maxpart __P((void));
}
%token AND AT ATTACH BUILD COMPILE_WITH CONFIG DEFINE DEFOPT DEVICE DUMPS
%token ENDFILE XFILE XOBJECT XLIBRARY FILE_SYSTEM FLAGS INCLUDE XMACHINE
%token ENDFILE XFILE XOBJECT FILE_SYSTEM FLAGS INCLUDE XMACHINE
%token MAJOR MAKEOPTIONS
%token MAXUSERS MAXPARTITIONS MINOR ON OPTIONS PSEUDO_DEVICE ROOT SOURCE
%token TYPE WITH NEEDS_COUNT NEEDS_FLAG
@ -175,8 +175,7 @@ file:
XFILE PATHNAME fopts fflgs rule { addfile($2, $3, $4, $5); };
object:
XOBJECT PATHNAME fopts oflgs { addobject($2, $3, $4); } |
XLIBRARY PATHNAME fopts oflgs { addobject($2, $3, $4); };
XOBJECT PATHNAME fopts oflgs { addobject($2, $3, $4); };
/* order of options is important, must use right recursion */
fopts:

3
usr.sbin/config/scan.l
View File

@ -1,5 +1,5 @@
%{
/* $NetBSD: scan.l,v 1.16 1997/10/10 10:27:58 mycroft Exp $ */
/* $NetBSD: scan.l,v 1.17 1997/10/10 10:41:19 mycroft Exp $ */
/*
* Copyright (c) 1992, 1993
@ -96,7 +96,6 @@ file return XFILE;
file-system return FILE_SYSTEM;
flags return FLAGS;
include return INCLUDE;
library return XLIBRARY;
machine return XMACHINE;
major return MAJOR;
makeoptions return MAKEOPTIONS;