summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2010-08-29 23:05:26 +0000
committerPaul Smith <psmith@gnu.org>2010-08-29 23:05:26 +0000
commita86d1693bac05e04f90a2ee3c4fa3547c788377c (patch)
treee26687d523ee3e243ca9f0b0dc6a2f4d57321919 /main.c
parent3b1432d86aebdc48aaa52efa06fad1ad662b38d7 (diff)
downloadgunmake-a86d1693bac05e04f90a2ee3c4fa3547c788377c.tar.gz
Bump the version to 3.82.90.
Fix some doc bugs. Implement the --trace flag. Show filename/linenumber on error.
Diffstat (limited to 'main.c')
-rw-r--r--main.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/main.c b/main.c
index 782b0de..51764dd 100644
--- a/main.c
+++ b/main.c
@@ -151,9 +151,9 @@ static int debug_flag = 0;
int db_level = 0;
-/* Output level (--verbosity). */
+/* Tracing (--trace). */
-static struct stringlist *verbosity_flags;
+int trace_flag = 0;
#ifdef WINDOWS32
/* Suspend make in main for a short time to allow debugger to attach */
@@ -358,6 +358,8 @@ static const char *const usage[] =
N_("\
-t, --touch Touch targets instead of remaking them.\n"),
N_("\
+ --trace Print tracing information.\n"),
+ N_("\
-v, --version Print the version number of make and exit.\n"),
N_("\
-w, --print-directory Print the current directory.\n"),
@@ -414,9 +416,8 @@ static const struct command_switch switches[] =
{ 'S', flag_off, &keep_going_flag, 1, 1, 0, 0, &default_keep_going_flag,
"no-keep-going" },
{ 't', flag, &touch_flag, 1, 1, 1, 0, 0, "touch" },
+ { CHAR_MAX+3, flag, &trace_flag, 1, 1, 0, 0, 0, "trace" },
{ 'v', flag, &print_version_flag, 1, 1, 0, 0, 0, "version" },
- { CHAR_MAX+3, string, &verbosity_flags, 1, 1, 0, 0, 0,
- "verbosity" },
{ 'w', flag, &print_directory_flag, 1, 1, 0, 0, 0, "print-directory" },
{ CHAR_MAX+4, flag, &inhibit_print_directory_flag, 1, 1, 0, 0, 0,
"no-print-directory" },
@@ -1282,7 +1283,7 @@ main (int argc, char **argv, char **envp)
always_make_flag = always_make_set && (restarts == 0);
/* Print version information. */
- if (print_version_flag || print_data_base_flag || db_level)
+ if (print_version_flag || print_data_base_flag || ISDB (DB_BASIC))
{
print_version ();