ncurses 5.4

[ncurses.git] / mk-2nd.awk

diff --git a/mk-2nd.awk b/mk-2nd.awk
index 2d998b0c5c3dae336388be80930773337c7ea99b..629b1697a2e88dbf84147f8d2f8f606b856dd18f 100644 (file)
--- a/mk-2nd.awk
+++ b/mk-2nd.awk
@@ -1,6 +1,6 @@
-# $Id: mk-2nd.awk,v 1.11 1998/10/17 21:54:21 Alexander.V.Lukyanov Exp $
+# $Id: mk-2nd.awk,v 1.15 2003/11/01 22:42:50 tom Exp $
 ##############################################################################
-# Copyright (c) 1998 Free Software Foundation, Inc.                          #
+# Copyright (c) 1998-2000,2003 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -27,7 +27,7 @@
 # authorization.                                                             #
 ##############################################################################
 #
-# Author: Thomas E. Dickey <dickey@clark.net> 1996,1997
+# Author: Thomas E. Dickey
 #
 # Generate compile-rules for the modules that we are using in libraries or
 # programs.  We are listing them explicitly because we have turned off the
@@ -67,7 +67,14 @@ BEGIN        {
                        }
                }
        }
-       !/^[@#]/ {
+       /^[@#]/ {
+               next
+       }
+       $1 ~ /trace/ {
+               if (traces != "all" && traces != MODEL && $1 != "lib_trace")
+                       next
+       }
+       {
                if ($0 != "" \
                 && using != 0) {
                        found = 1
@@ -80,7 +87,7 @@ BEGIN {
                                        compile="CC"
                                        suffix=".c"
                                }
-                               printf "../%s/%s.o :\t%s/%s%s", model, $1, $3, $1, suffix
+                               printf "../%s/%s$o :\t%s/%s%s", model, $1, $3, $1, suffix
                                for (n = 4; n <= NF; n++) printf " \\\n\t\t\t%s", $n
                                print  ""
                                if ( echo == "yes" )
@@ -93,9 +100,9 @@ BEGIN        {
                                        dir = $3 "/"
                                        sub("^\\$\\(srcdir\\)/","",dir);
                                        sub("^\\./","",dir);
-                                       printf "\t%scd ../%s; $(%s) $(CFLAGS_%s) -c ../%s/%s%s%s", atsign, model, compile, MODEL, name, dir, $1, suffix
+                                       printf "\t%scd ../%s; $(LIBTOOL_COMPILE) $(%s) $(CFLAGS_%s) -c ../%s/%s%s%s", atsign, model, compile, MODEL, name, dir, $1, suffix
                                } else
-                                       printf "\t%scd ../%s; $(%s) $(CFLAGS_%s) -c %s/%s%s", atsign, model, compile, MODEL, $3, $1, suffix
+                                       printf "\t%scd ../%s; $(LIBTOOL_COMPILE) $(%s) $(CFLAGS_%s) -c %s/%s%s", atsign, model, compile, MODEL, $3, $1, suffix
                        } else {
                                printf "%s", $1
                                for (n = 2; n <= NF; n++) printf " %s", $n