[ros-diffs] [gvg] 18791: Sync to Wine-0_9:

Sync to Wine-0_9:
Robert Lunnon [e-mail]
- Remove SVR4 specific pseudo-ops.
Alexandre Julliard [e-mail]
- Put Wine version information in all the man pages.
- Fixed some nroff warnings.
- Added global rules for man pages.
Simon Richter [e-mail]
- Fix winebuild's ppc assembly generation.
Modified: trunk/reactos/tools/winebuild/Makefile.in
Modified: trunk/reactos/tools/winebuild/import.c
Modified: trunk/reactos/tools/winebuild/utils.c
Modified: trunk/reactos/tools/winebuild/winebuild.man.in
  _____

Modified: trunk/reactos/tools/winebuild/Makefile.in
--- trunk/reactos/tools/winebuild/Makefile.in	2005-10-27 18:18:40 UTC
(rev 18790)
+++ trunk/reactos/tools/winebuild/Makefile.in	2005-10-27 18:32:01 UTC
(rev 18791)
@@ -5,6 +5,7 @@

EXEEXT    = @EXEEXT@

PROGRAMS = winebuild$(EXEEXT)
+MANPAGES = winebuild.man
 MODULE   = none

C_SRCS = \
@@ -18,17 +19,14 @@
    spec32.c \
    utils.c

-all: $(PROGRAMS) winebuild.man
+all: $(PROGRAMS) $(MANPAGES)

@MAKE_RULES@

winebuild$(EXEEXT): $(OBJS)
    $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPORT) $(LDFLAGS)

-winebuild.man: winebuild.man.in
-	sed -e 's,@PACKAGE_STRING@,@PACKAGE_STRING@,g'
$(SRCDIR)/winebuild.man.in >$@ || ($(RM) $@ && false)
-
-install:: $(PROGRAMS) winebuild.man
+install:: $(PROGRAMS) $(MANPAGES)
    $(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
    $(INSTALL_PROGRAM) winebuild$(EXEEXT)
$(bindir)/winebuild$(EXEEXT)
    $(INSTALL_DATA) winebuild.man
$(mandir)/man$(prog_manext)/winebuild.$(prog_manext)
@@ -36,7 +34,4 @@
 uninstall::
    $(RM) $(bindir)/winebuild$(EXEEXT)
$(mandir)/man$(prog_manext)/winebuild.$(prog_manext)

-clean::
-	$(RM) winebuild.man
-
 ### Dependencies:
  _____

Modified: trunk/reactos/tools/winebuild/import.c
--- trunk/reactos/tools/winebuild/import.c	2005-10-27 18:18:40 UTC
(rev 18790)
+++ trunk/reactos/tools/winebuild/import.c	2005-10-27 18:32:01 UTC
(rev 18791)
@@ -720,7 +720,7 @@

}
         else
         {
-            fprintf( outfile, "\tlis %s, (%s+%d)@hi\n", ppc_reg(9),
table, pos );
+            fprintf( outfile, "\tlis %s, (%s+%d)@h\n", ppc_reg(9),
table, pos );
             fprintf( outfile, "\tla  %s, (%s+%d)@l(%s)\n", ppc_reg(8),
table, pos, ppc_reg(9) );
         }
         fprintf( outfile, "\tlwz  %s, 0(%s)\n", ppc_reg(7), ppc_reg(8)
);
  _____

Modified: trunk/reactos/tools/winebuild/utils.c
--- trunk/reactos/tools/winebuild/utils.c	2005-10-27 18:18:40 UTC
(rev 18790)
+++ trunk/reactos/tools/winebuild/utils.c	2005-10-27 18:32:01 UTC
(rev 18791)
@@ -515,9 +515,6 @@

case PLATFORM_WINDOWS:
         sprintf( buffer, ".def _%s; .scl 2; .type 32; .endef", func );
         break;
-    case PLATFORM_SVR4:
-        sprintf( buffer, ".type %s,2", func );
-        break;
     default:
         sprintf( buffer, ".type %s,@function", func );
         break;
@@ -574,7 +571,6 @@
     switch (target_platform)
     {
     case PLATFORM_APPLE:
-    case PLATFORM_SVR4:
         return ".asciz";
     default:
         return ".string";
@@ -585,7 +581,6 @@
 {
     switch (target_platform)
     {
-    case PLATFORM_SVR4: return ".half";
     default:            return ".short";
     }
 }
  _____

Modified: trunk/reactos/tools/winebuild/winebuild.man.in
--- trunk/reactos/tools/winebuild/winebuild.man.in	2005-10-27
18:18:40 UTC (rev 18790)
+++ trunk/reactos/tools/winebuild/winebuild.man.in	2005-10-27
18:32:01 UTC (rev 18791)
@@ -1,5 +1,5 @@

." -*- nroff -*-
-.TH WINEBUILD 1 "September 2005" "@PACKAGE_STRING@" "Wine dll builder"
+.TH WINEBUILD 1 "October 2005" "@PACKAGE_STRING@" "Wine Developers
Manual"
 .SH NAME
 winebuild - Wine dll builder
 .SH SYNOPSIS
@@ -20,10 +20,10 @@
 .TP
 .BI --dll
 Build an assembly file from a .spec file (see \fBSPEC FILE SYNTAX\fR
-for details), or from a standard Windows .def file. The
-.spec/.def file is specified via the -E option. The resulting file
-must be assembled and linked to the other object files to build a
-working Wine dll.  In this mode, the
+for details), or from a standard Windows .def file. The .spec/.def
+file is specified via the -E option. The resulting file must be
+assembled and linked to the other object files to build a working Wine
+dll.  In this mode, the
 .I input files
 should be the list of all object files that will be linked into the
 final dll, to allow