Alexandre Julliard : winebuild: Add -b as a short option for --target for gcc compatibility.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 034a7f8849d6fa1c734cb14a824611a32d6871ca
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=034a7f8849d6fa1c734cb14a82...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Jan 14 12:52:53 2009 +0100

winebuild: Add -b as a short option for --target for gcc compatibility.

---

 tools/winebuild/main.c           |   13 ++++++-------
 tools/winebuild/winebuild.man.in |   10 +++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c
index 31ef8a0..e88522f 100644
--- a/tools/winebuild/main.c
+++ b/tools/winebuild/main.c
@@ -223,6 +223,7 @@ static const char usage_str[] =
 "Usage: winebuild [OPTIONS] [FILES]\n\n"
 "Options:\n"
 "       --as-cmd=AS          Command to use for assembling (default: as)\n"
+"   -b, --target=TARGET      Specify target CPU and platform for cross-compiling\n"
 "   -d, --delay-lib=LIB      Import the specified library in delayed mode\n"
 "   -D SYM                   Ignored for C flags compatibility\n"
 "   -e, --entry=FUNC         Set the DLL entry point function (default: DllMain)\n"
@@ -247,7 +248,6 @@ static const char usage_str[] =
 "   -r, --res=RSRC.RES       Load resources from RSRC.RES\n"
 "       --save-temps         Do not delete the generated intermediate files\n"
 "       --subsystem=SUBSYS   Set the subsystem (one of native, windows, console)\n"
-"       --target=TARGET      Specify target CPU and platform for cross-compiling\n"
 "   -u, --undefined=SYMBOL   Add an undefined reference to SYMBOL when linking\n"
 "   -v, --verbose            Display the programs invoked\n"
 "       --version            Print the version and exit\n"
@@ -274,11 +274,10 @@ enum long_options_values
     LONG_OPT_RELAY32,
     LONG_OPT_SAVE_TEMPS,
     LONG_OPT_SUBSYSTEM,
-    LONG_OPT_TARGET,
     LONG_OPT_VERSION
 };
 
-static const char short_options[] = "C:D:E:F:H:I:K:L:M:N:d:e:f:hi:kl:m:o:r:u:vw";
+static const char short_options[] = "C:D:E:F:H:I:K:L:M:N:b:d:e:f:hi:kl:m:o:r:u:vw";
 
 static const struct option long_options[] =
 {
@@ -294,9 +293,9 @@ static const struct option long_options[] =
     { "relay32",       0, 0, LONG_OPT_RELAY32 },
     { "save-temps",    0, 0, LONG_OPT_SAVE_TEMPS },
     { "subsystem",     1, 0, LONG_OPT_SUBSYSTEM },
-    { "target",        1, 0, LONG_OPT_TARGET },
     { "version",       0, 0, LONG_OPT_VERSION },
     /* aliases for short options */
+    { "target",        1, 0, 'b' },
     { "delay-lib",     1, 0, 'd' },
     { "export",        1, 0, 'E' },
     { "entry",         1, 0, 'e' },
@@ -372,6 +371,9 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec )
         case 'N':
             spec->dll_name = xstrdup( optarg );
             break;
+        case 'b':
+            set_target( optarg );
+            break;
         case 'd':
             add_delayed_import( optarg );
             break;
@@ -476,9 +478,6 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec )
         case LONG_OPT_SUBSYSTEM:
             set_subsystem( optarg, spec );
             break;
-        case LONG_OPT_TARGET:
-            set_target( optarg );
-            break;
         case LONG_OPT_VERSION:
             printf( "winebuild version " PACKAGE_VERSION "\n" );
             exit(0);
diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in
index 2e8aa75..08e8d1b 100644
--- a/tools/winebuild/winebuild.man.in
+++ b/tools/winebuild/winebuild.man.in
@@ -59,6 +59,11 @@ Wine internal usage only, you should never need to use this option.
 Specify the command to use to compile assembly files; the default is
 \fBas\fR.
 .TP
+.BI \-b,\ --target= cpu-manufacturer[-kernel]-os
+Specify the target CPU and platform on which the generated code will
+be built. The target specification is in the standard autoconf format
+as returned by config.sub.
+.TP
 .BI \-d,\ --delay-lib= name
 Set the delayed import mode for the specified library, which must be
 one of the libraries imported with the \fB-l\fR option. Delayed mode
@@ -199,11 +204,6 @@ argument array to use Unicode strings. A graphical executable has a
 Optionally a major and minor subsystem version can also be specified;
 the default subsystem version is 4.0.
 .TP
-.BI --target= cpu-manufacturer[-kernel]-os
-Specify the target CPU and platform on which the generated code will
-be built. The target specification is in the standard autoconf format
-as returned by config.sub.
-.TP
 .BI \-u,\ --undefined= symbol
 Add \fIsymbol\fR to the list of undefined symbols when invoking the
 linker. This makes it possible to force a specific module of a static