[src/trunk]: src/usr.bin/crunch/crunchgen - move LDSTATIC=-static to the bott...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ca7bcbf49eed
branches:  trunk
changeset: 535472:ca7bcbf49eed
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Aug 20 01:52:58 2002 +0000

description:
- move LDSTATIC=-static to the bottom, so that "LDSTATIC=" in /etc/mk.conf
  doesn't cause lossage
- set NOMAN= at the top (rather than MKMAN=no)

diffstat:

 usr.bin/crunch/crunchgen/crunchgen.c |  19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diffs (75 lines):

diff -r 3e1c041e98a4 -r ca7bcbf49eed usr.bin/crunch/crunchgen/crunchgen.c
--- a/usr.bin/crunch/crunchgen/crunchgen.c      Tue Aug 20 00:48:31 2002 +0000
+++ b/usr.bin/crunch/crunchgen/crunchgen.c      Tue Aug 20 01:52:58 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: crunchgen.c,v 1.39 2002/07/09 12:49:10 pooka Exp $     */
+/*     $NetBSD: crunchgen.c,v 1.40 2002/08/20 01:52:58 lukem Exp $     */
 /*
  * Copyright (c) 1994 University of Maryland
  * All Rights Reserved.
@@ -33,7 +33,7 @@
  */
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: crunchgen.c,v 1.39 2002/07/09 12:49:10 pooka Exp $");
+__RCSID("$NetBSD: crunchgen.c,v 1.40 2002/08/20 01:52:58 lukem Exp $");
 #endif
 
 #if HAVE_CONFIG_H
@@ -494,6 +494,7 @@
 
 void fillin_program_objs(prog_t *p, char *path);
 void top_makefile_rules(FILE *outmk);
+void bottom_makefile_rules(FILE *outmk);
 void prog_makefile_rules(FILE *outmk, prog_t *p);
 void output_strlst(FILE *outf, strlst_t *lst);
 char *genident(char *str);
@@ -734,6 +735,9 @@
 
     fprintf(outmk, "\n.include <bsd.prog.mk>\n");
     fprintf(outmk, "\n# ========\n");
+
+    bottom_makefile_rules(outmk);
+
     fclose(outmk);
 }
 
@@ -818,6 +822,8 @@
 {
     prog_t *p;
 
+    fprintf(outmk, "NOMAN=\n\n");
+
     fprintf(outmk, "DBG=%s\n", dbg);
     fprintf(outmk, "STRIP?=strip\n");
     fprintf(outmk, "MAKE?=make\n");
@@ -831,7 +837,6 @@
     for(p = progs; p != NULL; p = p->next)
        fprintf(outmk, " %s.cro", p->name);
     fprintf(outmk, "\n");
-    fprintf(outmk, "LDSTATIC=-static\n");
     fprintf(outmk, "DPADD+= ${CRUNCHED_OBJS}\n");
     fprintf(outmk, "LDADD+= ${CRUNCHED_OBJS} ");
     output_strlst(outmk, libs);
@@ -842,8 +847,7 @@
        fprintf(outmk, " %s_make", p->ident);
     fprintf(outmk, "\n\n");
 
-    fprintf(outmk, "PROG=%s\n", execfname);
-    fprintf(outmk, "MKMAN=no\n\n");
+    fprintf(outmk, "PROG=%s\n\n", execfname);
     
     fprintf(outmk, "all: ${PROG}\n\t${STRIP} ${PROG}\n");
     fprintf(outmk, "objs: $(SUBMAKE_TARGETS)\n");
@@ -852,6 +856,11 @@
            execfname);
 }
 
+void bottom_makefile_rules(FILE *outmk)
+{
+    fprintf(outmk, "LDSTATIC=-static\n");
+}
+
 
 void prog_makefile_rules(FILE *outmk, prog_t *p)
 {