 @@ -1,14 +1,14 @@
-/*	$NetBSD: mkmakefile.c,v 1.38 2015/08/28 03:55:15 uebayasi Exp $	*/
+/*	$NetBSD: mkmakefile.c,v 1.39 2015/08/28 08:31:28 uebayasi Exp $	*/
 /*
  * 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
  * contributed to Berkeley.
+ *
  * 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, Lawrence Berkeley Laboratories.
 @@ -35,49 +35,43 @@
  * 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.
+ *
  *	from: @(#)mkmakefile.c	8.1 (Berkeley) 6/6/93
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: mkmakefile.c,v 1.38 2015/08/28 03:55:15 uebayasi Exp $");
+__RCSID("$NetBSD: mkmakefile.c,v 1.39 2015/08/28 08:31:28 uebayasi Exp $");
 #include <sys/param.h>
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <err.h>
 #include <util.h>
 #include "defs.h"
 #include "sem.h"
 /*
  * Make the Makefile.
  */
 static const char *srcpath(struct files *);
 static const char *prefix_prologue(const char *);
 static const char *filetype_prologue(struct filetype *);
 static void emitdefs(FILE *);
 static void emitfiles(FILE *, int, int);
 static void emitobjs(FILE *);
 static void emitallkobjs(FILE *);
 static int emitallkobjscb(const char *, void *, void *);
 static void emitattrkobjs(FILE *);
 static int emitattrkobjscb(const char *, void *, void *);
 static void emitkobjs(FILE *);
 static void emitcfiles(FILE *);
 static void emitsfiles(FILE *);
 static void emitrules(FILE *);
 static void emitload(FILE *);
 @@ -253,66 +247,26 @@ emitsubs(FILE *fp, const char *line, con
 			if (option != NULL)
 				fputs(option->nv_str ? option->nv_str : "1",
 				    fp);
 			/*
 			 * Otherwise it's not a selected option and we don't
 			 * output anything.
 			 */
+		}
 		line = nextpct + 1;
+	}
+}
 /*
  * Return (possibly in a static buffer) the name of the `source' for a
  * file.  If we have `options source', or if the file is marked `always
  * source', this is always the path from the `file' line; otherwise we
  * get the .o from the obj-directory.
  */
 static const char *
 srcpath(struct files *fi)
 #if 1
 	/* Always have source, don't support object dirs for kernel builds. */
 	return (fi->fi_path);
 #else
 	static char buf[MAXPATHLEN];
 	if (have_source || (fi->fi_flags & FI_ALWAYSSRC) != 0)
 		return (fi->fi_path);
 	if (objpath == NULL) {
 		cfgerror("obj-directory not set");
 		return (NULL);
 	(void)snprintf(buf, sizeof buf, "%s/%s.o", objpath, fi->fi_base);
 	return (buf);
 #endif
 static const char *
 filetype_prologue(struct filetype *fit)
 	return (*fit->fit_path == '/') ? "" : "$S/";
 static const char *
 prefix_prologue(const char *path)
 	return (*path == '/') ? "" : "$S/";
 static void
 emitdefs(FILE *fp)
+{
 	struct nvlist *nv;
 	fprintf(fp, "KERNEL_BUILD=%s\n", conffile);
 	fputs("IDENT= \\\n", fp);
 	for (nv = options; nv != NULL; nv = nv->nv_next) {
 		/* Skip any options output to a header file */
 		if (DEFINED_OPTION(nv->nv_name))
 			continue;
 		const char *s = nv->nv_str;
 @@ -345,35 +299,32 @@ emitobjs(FILE *fp)
 	struct objects *oi;
 	fputs("OBJS= \\\n", fp);
 	TAILQ_FOREACH(fi, &allfiles, fi_next) {
 		if ((fi->fi_flags & FI_SEL) == 0)
 			continue;
 		fprintf(fp, "\t%s.o \\\n", fi->fi_base);
+	}
 	TAILQ_FOREACH(oi, &allobjects, oi_next) {
 		const char *prologue, *prefix, *sep;
 		if ((oi->oi_flags & OI_SEL) == 0)
 			continue;
-		prologue = prefix = sep = "";
+		prologue = "$S/";
-		if (*oi->oi_path != '/') {
+		if (oi->oi_prefix != NULL) {
-			if (oi->oi_prefix != NULL) {
+			prefix = oi->oi_prefix;
-				prologue = prefix_prologue(oi->oi_path);
+			sep = "/";
-				prefix = oi->oi_prefix;
+		} else {
-				sep = "/";
+			prefix = sep = "";
 			} else {
 				prologue = filetype_prologue(&oi->oi_fit);
+		}
 		fprintf(fp, "\t%s%s%s%s \\\n", prologue, prefix, sep,
 		    oi->oi_path);
+	}
 	putc('\n', fp);
+}
 static void
 emitkobjs(FILE *fp)
+{
 	emitallkobjs(fp);
 	emitattrkobjs(fp);
+}
 @@ -489,94 +440,84 @@ emitcfiles(FILE *fp)
+}
 static void
 emitsfiles(FILE *fp)
+{
 	emitfiles(fp, 's', 'S');
+}
 static void
 emitfiles(FILE *fp, int suffix, int upper_suffix)
+{
 	struct files *fi;
 	const char *fpath;
  	struct config *cf;
  	char swapname[100];
 	fprintf(fp, "%cFILES= \\\n", toupper(suffix));
 	TAILQ_FOREACH(fi, &allfiles, fi_next) {
 		const char *prologue, *prefix, *sep;
 		if ((fi->fi_flags & FI_SEL) == 0)
 			continue;
 		fpath = srcpath(fi);
 		if (fi->fi_suffix != suffix && fi->fi_suffix != upper_suffix)
 			continue;
-		prologue = prefix = sep = "";
+		prologue = "$S/";
-		if (*fi->fi_path != '/') {
+		if (fi->fi_prefix != NULL) {
-			if (fi->fi_prefix != NULL) {
+			prefix = fi->fi_prefix;
-				prologue = prefix_prologue(fi->fi_prefix);
+			sep = "/";
-				prefix = fi->fi_prefix;
+		} else {
-				sep = "/";
+			prefix = sep = "";
 			} else {
 				prologue = filetype_prologue(&fi->fi_fit);
+		}
-		fprintf(fp, "\t%s%s%s%s \\\n",
+		fprintf(fp, "\t%s%s%s%s \\\n", prologue, prefix, sep,
-		    prologue, prefix, sep, fpath);
+		    fi->fi_path);
+	}
  	/*
  	 * 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') {
  		TAILQ_FOREACH(cf, &allcf, cf_next) {
  			(void)snprintf(swapname, sizeof(swapname), "swap%s.c",
  			    cf->cf_name);
  			fprintf(fp, "\t%s \\\n", swapname);
+ 		}
+ 	}
 	putc('\n', fp);
+}
 /*
  * Emit the make-rules.
  */
 static void
 emitrules(FILE *fp)
+{
 	struct files *fi;
 	const char *fpath;
 	TAILQ_FOREACH(fi, &allfiles, fi_next) {
 		const char *prologue, *prefix, *sep;
 		if ((fi->fi_flags & FI_SEL) == 0)
 			continue;
-		fpath = srcpath(fi);
+		prologue = "$S/";
-		prologue = prefix = sep = "";
+		if (fi->fi_prefix != NULL) {
-		if (*fpath != '/') {
+			prefix = fi->fi_prefix;
-			if (fi->fi_prefix != NULL) {
+			sep = "/";
-				prologue = prefix_prologue(fi->fi_prefix);
+		} else {
-				prefix = fi->fi_prefix;
+			prefix = sep = "";
 				sep = "/";
-			} else {
+		fprintf(fp, "%s.o: %s%s%s%s\n", fi->fi_base, prologue, prefix,
-				prologue = filetype_prologue(&fi->fi_fit);
+		    sep, fi->fi_path);
 		fprintf(fp, "%s.o: %s%s%s%s\n", fi->fi_base,
 		    prologue, prefix, sep, fpath);
 		if (fi->fi_mkrule != NULL) {
 			fprintf(fp, "\t%s\n\n", fi->fi_mkrule);
 		} else {
 			fprintf(fp, "\t${NORMAL_%c}\n\n", toupper(fi->fi_suffix));
+		}
+	}
+}
 /*
  * Emit the load commands.
+ *
  * This function is not to be called `spurt'.
  */
 @@ -622,27 +563,27 @@ emitload(FILE *fp)
 	fputs("\n", fp);
+}
 /*
  * Emit include headers (for any prefixes encountered)
  */
 static void
 emitincludes(FILE *fp)
+{
 	struct prefix *pf;
 	SLIST_FOREACH(pf, &allprefixes, pf_next) {
 		fprintf(fp, "EXTRA_INCLUDES+=\t-I%s%s\n",
-		    prefix_prologue(pf->pf_prefix), pf->pf_prefix);
+		    "$S/", pf->pf_prefix);
+	}
+}
 /*
  * Emit appending makeoptions.
  */
 static void
 emitappmkoptions(FILE *fp)
+{
 	struct nvlist *nv;
 	struct condexpr *cond;
 	for (nv = appmkoptions; nv != NULL; nv = nv->nv_next)