From 3778ca7f045f932e8f90705d8dca0d4477088ed1 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Mon, 7 Oct 2019 10:39:35 -0300
Subject: [PATCH] Adding files required for windows sdk package.

---
 Makefile.in        |  3 +++
 client/Makefile.in | 34 ++++++++++++++++++++++++++++++----
 configure.ac       | 20 ++++++++++----------
 3 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 219be14..24f45e1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,6 +93,9 @@ install-static:
 install-devel:
 	@$(MAKE) -C client DESTDIR=$(DESTDIR) install-devel
 
+install-winlib:
+	@$(MAKE) -C client DESTDIR=$(DESTDIR) install-winlib
+
 doc:
 	@$(DOXYGEN) ./doxygen/doxyfile
 
diff --git a/client/Makefile.in b/client/Makefile.in
index 2bb870b..d088650 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -28,6 +28,7 @@
 
 MODULE_NAME=ipc3270
 PACKAGE_NAME=@PACKAGE_NAME@
+PRODUCT_NAME=@PRODUCT_NAME@
 
 MAIN_SOURCES= \
 	$(wildcard src/core/*.cc) \
@@ -62,6 +63,7 @@ MSGCAT=@MSGCAT@
 WINDRES=@WINDRES@
 AR=@AR@
 VALGRIND=@VALGRIND@
+DLLTOOL=@DLLTOOL@
 
 #---[ Paths ]----------------------------------------------------------------------------
 
@@ -107,11 +109,10 @@ CFLAGS= \
 	@DBUS_CFLAGS@
 
 LDFLAGS=\
-	@STATIC_LDFLAGS@ \
 	@LDFLAGS@
 
 LIBS= \
-	@STATIC_LIBS@ \
+	@CLIENT_LIBS@ \
 	@LIBS@ \
 	@LIBICONV@ \
 	@INTL_LIBS@ \
@@ -204,7 +205,8 @@ $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@: \
 	@$(MKDIR) $(@D)
 	@echo $< ...
 	@$(LD) \
-		-shared -Wl,-soname,$(@F) \
+		@CLIENT_LDFLAGS@ \
+		-Wl,-soname,$(@F) \
 		-o $@ \
 		$(LDFLAGS) \
 		$^ \
@@ -281,6 +283,28 @@ install-devel:
 		sdk/ipc3270.pc \
 		$(DESTDIR)$(libdir)/pkgconfig/ipc3270.pc
 
+install-winlib: \
+	$(BINRLS)/lib$(MODULE_NAME)@LIBEXT@
+
+	@$(MKDIR) \
+		$(DESTDIR)$(libdir)
+
+	@$(INSTALL_DATA) \
+		$(BINRLS)/lib$(MODULE_NAME).dll.a \
+		$(DESTDIR)$(libdir)
+
+	@$(DLLTOOL) \
+		--input-def $(BINRLS)/lib$(MODULE_NAME).def \
+		--dllname lib$(MODULE_NAME).dll \
+		--output-lib $(DESTDIR)$(libdir)/lib$(MODULE_NAME).lib
+
+	@$(MKDIR) \
+		$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
+
+	@$(INSTALL_DATA) \
+		$(BINRLS)/lib$(MODULE_NAME).def \
+		$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
+
 #---[ Misc Targets ]---------------------------------------------------------------------
 
 $(POTDIR)/$(MODULE_NAME).pot: \
@@ -310,6 +334,7 @@ $(BINDBG)/$(MODULE_NAME)-client@EXEEXT@: \
 		$^ \
 		-L$(BINDBG) \
 		-Wl,-rpath,$(BINDBG) \
+		@CLIENT_LDFLAGS@ \
 		$(LDFLAGS) \
 		$(LIBS)
 
@@ -321,7 +346,8 @@ $(BINDBG)/lib$(MODULE_NAME)@LIBEXT@: \
 	@$(MKDIR) $(@D)
 	@echo $< ...
 	@$(LD) \
-		-shared -Wl,-soname,$(@F) \
+		@CLIENT_LDFLAGS@ \
+		-Wl,-soname,$(@F) \
 		-o $@ \
 		$(LDFLAGS) \
 		$^ \
diff --git a/configure.ac b/configure.ac
index 4c54e3f..2fd9c0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,26 +66,25 @@ PLUGINS=""
 APP_RESOURCES=""
 APP_LDFLAGS=""
 DLL_LDFLAGS="-shared"
-STATIC_LDFLAGS=""
-STATIC_LIBS=""
+CLIENT_LDFLAGS=""
+CLIENT_LIBS=""
 CLIENT_TARGETS="shared devel"
 
 dnl ---------------------------------------------------------------------------
 dnl Check for OS specifics
 dnl ---------------------------------------------------------------------------
 
-DLLPREFIX="lib"
-
 case "$host" in
 	*-mingw32|*-pc-msys)
 		app_cv_osname="windows"
 		CFLAGS="$CFLAGS -D_WIN32_WINNT=0x0600"
 		LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32 -lkernel32"
 		LDFLAGS="$LDFLAGS"
-		STATIC_LDFLAGS="-static-libgcc -static-libstdc++"
-		STATIC_LIBS="-Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic"
+		CLIENT_LDFLAGS="-shared -static-libgcc -static-libstdc++ -Wl,--output-def,\$(@D)/\lib\$(MODULE_NAME).def,--out-implib,\$(@D)/\lib\$(MODULE_NAME).dll.a"
+		CLIENT_LIBS="-Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic"
 		DLLEXT=".dll"
-		DLLPREFIX=""
+		CLIENT_TARGETS="$CLIENT_TARGETS winlib"
+
 
 		app_win32_revision=$(date +%-y.%-m.%-d.%-H)
 		AC_SUBST(WIN32_VERSION,$app_win32_revision)
@@ -110,6 +109,7 @@ case "$host" in
 		app_cv_osname="linux"
 		LOGDIR="/var/log"
 		DLLEXT=".so"
+		CLIENT_LDFLAGS="-shared"
 
 		app_cv_static='no'
 
@@ -122,9 +122,8 @@ AC_SUBST(OSNAME,$app_cv_osname)
 AC_SUBST(LIBS)
 AC_SUBST(LOGDIR)
 AC_SUBST(DLLEXT)
-AC_SUBST(DLLPREFIX)
-AC_SUBST(STATIC_LDFLAGS)
-AC_SUBST(STATIC_LIBS)
+AC_SUBST(CLIENT_LDFLAGS)
+AC_SUBST(CLIENT_LIBS)
 
 AC_CHECK_FUNC(vasprintf, AC_DEFINE(HAVE_VASPRINTF) )
 
@@ -134,6 +133,7 @@ dnl ---------------------------------------------------------------------------
 
 AC_PATH_TOOL([AR], [ar], [ar])
 AC_PATH_TOOL([WINDRES], [windres], [no])
+AC_PATH_TOOL([DLLTOOL], [dlltool], [no])
 
 PKG_CHECK_EXISTS
 
--
libgit2 0.21.2