Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-5]: src/usr.sbin/config Pull up revision 1.48 (via patch, reque...



details:   https://anonhg.NetBSD.org/src/rev/41540a9db742
branches:  netbsd-1-5
changeset: 490684:41540a9db742
user:      he <he%NetBSD.org@localhost>
date:      Mon Feb 26 17:07:03 2001 +0000

description:
Pull up revision 1.48 (via patch, requested by bjh21):
  Put both .S and .s files in SFILES so ``make depends'' works
  properly.  Fixes PR#12051.

diffstat:

 usr.sbin/config/mkmakefile.c |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r b8a9323449a5 -r 41540a9db742 usr.sbin/config/mkmakefile.c
--- a/usr.sbin/config/mkmakefile.c      Mon Feb 26 17:03:33 2001 +0000
+++ b/usr.sbin/config/mkmakefile.c      Mon Feb 26 17:07:03 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkmakefile.c,v 1.44 2000/02/01 05:13:17 enami Exp $    */
+/*     $NetBSD: mkmakefile.c,v 1.44.4.1 2001/02/26 17:07:03 he Exp $   */
 
 /*
  * Copyright (c) 1992, 1993
@@ -62,7 +62,7 @@
 static const char *prefix_prologue __P((const char *));
 
 static int emitdefs __P((FILE *));
-static int emitfiles __P((FILE *, int));
+static int emitfiles __P((FILE *, int, int));
 
 static int emitobjs __P((FILE *));
 static int emitcfiles __P((FILE *));
@@ -301,7 +301,7 @@
        FILE *fp;
 {
 
-       return (emitfiles(fp, 'c'));
+       return (emitfiles(fp, 'c', 0));
 }
 
 static int
@@ -309,13 +309,14 @@
        FILE *fp;
 {
 
-       return (emitfiles(fp, 's'));
+       return (emitfiles(fp, 's', 1));
 }
 
 static int
-emitfiles(fp, suffix)
+emitfiles(fp, suffix, upper_suffix)
        FILE *fp;
        int suffix;
+       int upper_suffix;
 {
        struct files *fi;
        struct config *cf;
@@ -333,7 +334,8 @@
                if ((fpath = srcpath(fi)) == NULL)
                         return (1);
                len = strlen(fpath);
-               if (fpath[len - 1] != suffix)
+               if (! ((fpath[len - 1] == suffix) ||
+                   (upper_suffix && fpath[len - 1] == toupper(suffix))))
                        continue;
                if (*fpath != '/') {
                        len += 3;       /* "$S/" */



Home | Main Index | Thread Index | Old Index