PATCH: make tools/makedep.c ignore -D options

Gerald Pfeifer gerald at pfeifer.com
Tue Feb 17 05:54:43 CST 2004


In the past months, I have received at least two very weird (and
originally hard to debug) bug reports, as some other Tools used by Wine
(notably arts) and/or users sometimes set -D... options as part of the
INCLUDE variable.

This patch works around that, by simply ignoring -D options.

Gerald


ChangeLog:
Silently ignore -D command-line options.

Index: makedep.c
===================================================================
RCS file: /home/wine/wine/tools/makedep.c,v
retrieving revision 1.17
diff -u -3 -p -r1.17 makedep.c
--- makedep.c	20 Jun 2003 21:31:13 -0000	1.17
+++ makedep.c	17 Feb 2004 09:15:22 -0000
@@ -67,7 +67,8 @@ static const char Usage[] =
     "   -Idir   Search for include files in directory 'dir'\n"
     "   -Cdir   Search for source files in directory 'dir'\n"
     "   -fxxx   Store output in file 'xxx' (default: Makefile)\n"
-    "   -sxxx   Use 'xxx' as separator (default: \"### Dependencies\")\n";
+    "   -sxxx   Use 'xxx' as separator (default: \"### Dependencies\")\n"
+    "   -Dxxx   This is a no-op, to work around bugs in other tools\n";


 /*******************************************************************
@@ -503,6 +504,9 @@ static void parse_option( const char *op
     case 'C':
         if (opt[2]) SrcDir = opt + 2;
         else SrcDir = NULL;
+        break;
+    case 'D':
+        /* Simply ignore -D... options. */
         break;
     case 'f':
         if (opt[2]) OutputFileName = opt + 2;



More information about the wine-patches mailing list