Source-Changes-HG archive

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

[src/trunk]: src/usr.bin/config Restore explicit rule for swap*.o.



details:   https://anonhg.NetBSD.org/src/rev/d70189ada500
branches:  trunk
changeset: 801802:d70189ada500
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon Aug 18 08:07:02 2014 +0000

description:
Restore explicit rule for swap*.o.

diffstat:

 usr.bin/config/mkmakefile.c |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (34 lines):

diff -r 37c22fc56929 -r d70189ada500 usr.bin/config/mkmakefile.c
--- a/usr.bin/config/mkmakefile.c       Mon Aug 18 07:52:40 2014 +0000
+++ b/usr.bin/config/mkmakefile.c       Mon Aug 18 08:07:02 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkmakefile.c,v 1.16 2014/08/17 21:17:44 joerg Exp $    */
+/*     $NetBSD: mkmakefile.c,v 1.17 2014/08/18 08:07:02 joerg Exp $    */
 
 /*
  * Copyright (c) 1992, 1993
@@ -507,7 +507,6 @@
 emitload(FILE *fp)
 {
        struct config *cf;
-       const char *nm, *swname;
 
        fputs(".MAIN: all\nall:", fp);
        TAILQ_FOREACH(cf, &allcf, cf_next) {
@@ -522,12 +521,11 @@
        }
        fputs("\n\n", fp);
        TAILQ_FOREACH(cf, &allcf, cf_next) {
-               nm = cf->cf_name;
-               swname =
-                   cf->cf_root != NULL ? cf->cf_name : "generic";
-               fprintf(fp, "KERNELS+=%s\n", nm);
+               fprintf(fp, "KERNELS+=%s\n", cf->cf_name);
                fprintf(fp, "%s: ${SYSTEM_DEP} swap%s.o vers.o build_kernel\n",
-                       nm, nm);
+                       cf->cf_name, cf->cf_name);
+               fprintf(fp, "swap%s.o: swap%s.c\n"
+                       "\t${NORMAL_C}\n\n", cf->cf_name, cf->cf_name);
        }
        fputs("\n", fp);
 }



Home | Main Index | Thread Index | Old Index