diff options
| -rw-r--r-- | usr.sbin/config/config.h | 11 | ||||
| -rw-r--r-- | usr.sbin/config/mkmakefile.c | 14 |
2 files changed, 12 insertions, 13 deletions
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h index 6dae1a2..faa5b31 100644 --- a/usr.sbin/config/config.h +++ b/usr.sbin/config/config.h @@ -56,12 +56,11 @@ struct file_list { /* * Types. */ -#define DRIVER 1 -#define NORMAL 2 -#define INVISIBLE 3 -#define PROFILING 4 -#define NODEPEND 5 -#define LOCAL 6 +#define NORMAL 1 +#define INVISIBLE 2 +#define PROFILING 3 +#define NODEPEND 4 +#define LOCAL 5 #define DEVDONE 0x80000000 #define TYPEMASK 0x7fffffff diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c index f023f62..c161ef8 100644 --- a/usr.sbin/config/mkmakefile.c +++ b/usr.sbin/config/mkmakefile.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)mkmakefile.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id: mkmakefile.c,v 1.42 1999/05/09 17:23:37 phk Exp $"; + "$Id: mkmakefile.c,v 1.43 1999/05/09 18:54:23 peter Exp $"; #endif /* not lint */ /* @@ -249,6 +249,7 @@ read_files() register struct opt *op; char *wd, *this, *needs, *special, *depends, *clean; char fname[80]; + int ddwarned = 0; int nreqs, first = 1, configdep, isdup, std, filetype, imp_rule, no_obj, before_depend, mandatory; @@ -266,7 +267,7 @@ openit: next: /* * filename [ standard | mandatory | optional ] [ config-dependent ] - * [ dev* | profiling-routine ] [ device-driver] [ no-obj ] + * [ dev* | profiling-routine ] [ no-obj ] * [ compile-with "compile rule" [no-implicit-rule] ] * [ dependency "dependency-list"] [ before-depend ] * [ clean "file-list"] @@ -404,7 +405,10 @@ nextparam: goto nextparam; } if (eq(wd, "device-driver")) { - filetype = DRIVER; + if (!ddwarned) { + printf("%s: `device-driver' flag ignored.\n", fname); + ddwarned++; + } goto nextparam; } if (eq(wd, "profiling-routine")) { @@ -716,10 +720,6 @@ do_rules(f) ftype = "NORMAL"; break; - case DRIVER: - ftype = "DRIVER"; - break; - case PROFILING: if (!profiling) continue; |
