[PATCH 2/2] port: first cut at native W32 building

[thb at libreoffice.org]

From: Thorsten Behrens <Thorsten.Behrens at CIB.de>

Co-authored-by: Stephan Bergmann <sbergman at redhat.com>
Signed-off-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
---
 src/Makefile.am       | 8 ++++----
 src/assuan-handler.c  | 2 +-
 src/mkheader.c        | 2 +-
 src/versioninfo.rc.in | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index f353e29..0792ec8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -83,7 +83,7 @@ endif
 
 if HAVE_W32_SYSTEM
 
-LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
+LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
      `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
      sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
 
@@ -144,11 +144,11 @@ install-exec-hook:
               $(DESTDIR)$(bindir)/gpgcedev.dll
 endif
 
-mkheader: mkheader.c Makefile
+mkheader$(EXEEXT): mkheader.c Makefile
 	$(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c
 
-assuan.h: assuan.h.in mkheader $(parts_of_assuan_h)
-	./mkheader $(host_os) $(srcdir)/assuan.h.in \
+assuan.h: assuan.h.in mkheader$(EXEEXT) $(parts_of_assuan_h)
+	./mkheader$(EXEEXT) $(host_os) $(srcdir)/assuan.h.in \
                    @VERSION@ @VERSION_NUMBER@ >$@
 
 
diff --git a/src/assuan-handler.c b/src/assuan-handler.c
index 2299fcd..5cc0fb0 100644
--- a/src/assuan-handler.c
+++ b/src/assuan-handler.c
@@ -396,7 +396,7 @@ static struct {
 
   { "INPUT",  std_handler_input, std_help_input, 0 },
   { "OUTPUT", std_handler_output, std_help_output, 0 },
-  { } };
+};
 
 
 /**
diff --git a/src/mkheader.c b/src/mkheader.c
index 0ee0944..e7a6f5c 100644
--- a/src/mkheader.c
+++ b/src/mkheader.c
@@ -100,7 +100,7 @@ write_special (const char *fname, int lnr, const char *tag)
                "# include <unistd.h>\n"
                "#endif\n", stdout);
       else
-        fputs ("#include <unistd.h>\n", stdout);
+        fputs ("#include <io.h>\n", stdout);
     }
   else if (!strcmp (tag, "include:types"))
     {
diff --git a/src/versioninfo.rc.in b/src/versioninfo.rc.in
index f9e7cb4..0c235c3 100644
--- a/src/versioninfo.rc.in
+++ b/src/versioninfo.rc.in
@@ -15,7 +15,6 @@
 
 #line __LINE__ "versioninfo.rc.in"
 
-#include <afxres.h>
 
 
 VS_VERSION_INFO VERSIONINFO
-- 
2.13.6