BSD 4_4 release

[unix-history] / usr / src / usr.sbin / config.new / mkmakefile.c

diff --git a/usr/src/usr.sbin/config.new/mkmakefile.c b/usr/src/usr.sbin/config.new/mkmakefile.c
index ef081db..06971a5 100644 (file)
--- a/usr/src/usr.sbin/config.new/mkmakefile.c
+++ b/usr/src/usr.sbin/config.new/mkmakefile.c
@@ -1,6 +1,6 @@
 /* 
 /* 

- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1992, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and


@@ -11,9 +11,35 @@
  *     This product includes software developed by the University of
  *     California, Lawrence Berkeley Laboratories.
  *
  *     This product includes software developed by the University of
  *     California, Lawrence Berkeley Laboratories.
  *

- * %sccs.include.redist.c%
+ * 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.

  *
  *

- *     @(#)mkmakefile.c        5.2 (Berkeley) %G%
+ *     @(#)mkmakefile.c        8.1 (Berkeley) 6/6/93

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -220,23 +246,32 @@ emitfiles(fp, suffix)
                lpos += len + 1;
                sp = ' ';
        }
                lpos += len + 1;
                sp = ' ';
        }

-       for (cf = allcf; cf != NULL; cf = cf->cf_next) {
-               if (cf->cf_root == NULL)
-                       (void)sprintf(swapname, "$S/%s/%s/swapgeneric.c",
-                           machine, machine);
-               else
-                       (void)sprintf(swapname, "swap%s.c", cf->cf_name);
-               len = strlen(swapname);
-               if (lpos + len > 72) {
-                       if (fputs(" \\\n", fp) < 0)
+       /*
+        * The allfiles list does not include the configuration-specific
+        * C source files.  These files should be eliminated someday, but
+        * for now, we have to add them to ${CFILES} (and only ${CFILES}).
+        */
+       if (suffix == 'c') {
+               for (cf = allcf; cf != NULL; cf = cf->cf_next) {
+                       if (cf->cf_root == NULL)
+                               (void)sprintf(swapname,
+                                   "$S/%s/%s/swapgeneric.c",
+                                   machine, machine);
+                       else
+                               (void)sprintf(swapname, "swap%s.c",
+                                   cf->cf_name);
+                       len = strlen(swapname);
+                       if (lpos + len > 72) {
+                               if (fputs(" \\\n", fp) < 0)
+                                       return (1);
+                               sp = '\t';
+                               lpos = 7;
+                       }
+                       if (fprintf(fp, "%c%s", sp, swapname) < 0)

                                return (1);
                                return (1);

-                       sp = '\t';
-                       lpos = 7;
+                       lpos += len + 1;
+                       sp = ' ';

                }
                }

-               if (fprintf(fp, "%c%s", sp, swapname) < 0)
-                       return (1);
-               lpos += len + 1;
-               sp = ' ';

        }
        if (lpos != 7 && putc('\n', fp) < 0)
                return (1);
        }
        if (lpos != 7 && putc('\n', fp) < 0)
                return (1);