Fixing MSYS/2 build.

Perry Werneck
1 parent f4b7f4e8
Showing 4 changed files with 44 additions and 38 deletions Show diff stats
Makefile.in
README.md
client/Makefile.in
configure.ac
@@ -84,8 +84,8 @@ install: \
 install-plugin:
 	@$(MAKE) -C server DESTDIR=$(DESTDIR) install
-install-shared:
-	@$(MAKE) -C client DESTDIR=$(DESTDIR) install-shared
+install-linux-lib:
+	@$(MAKE) -C client DESTDIR=$(DESTDIR) install-linux-lib
 install-static:
 	@$(MAKE) -C client DESTDIR=$(DESTDIR) install-static
@@ -93,8 +93,8 @@ install-static:
 install-devel:
 	@$(MAKE) -C client DESTDIR=$(DESTDIR) install-devel
-install-winlib:
-	@$(MAKE) -C client DESTDIR=$(DESTDIR) install-winlib
+install-windows-lib:
+	@$(MAKE) -C client DESTDIR=$(DESTDIR) install-windows-lib
 doc:
 	@$(DOXYGEN) ./doxygen/doxyfile
@@ -34,9 +34,9 @@ Cross-compiling on SuSE Linux (Native or WSL)
 	* https://build.opensuse.org/project/show/windows:mingw:win64
 	* https://build.opensuse.org/project/show/home:PerryWerneck:pw3270
-2. Get libv3270 sources from git
+2. Get sources from git
-	* git clone https://github.com/PerryWerneck/pw3270-plugin-ipc.git ./ipc3270
+	* git clone https://github.com/PerryWerneck/libipc3270.git ./libipc3270
 3. Install cross compilers
@@ -44,7 +44,7 @@ Cross-compiling on SuSE Linux (Native or WSL)
 4. Build
-	* cd ipc3270
+	* cd libipc3270
 	* make clean
 	* make all
@@ -60,14 +60,17 @@ Compiling for Windows (With MSYS2)
 	* Follow the guide on https://github.com/PerryWerneck/libv3270
-2. Get ip3270 sources from git
+3. Get sources from git
-	* git clone https://github.com/PerryWerneck/pw3270-plugin-ipc.git ./ipc3270
+	* git clone https://github.com/PerryWerneck/libipc3270.git ./libipc3270
 4. Build library using the mingw shell
-	* cd ipc3270
+	* cd libipc3270
 	* ./autogen.sh
 	* make all
+5. Install
+
+	* make install
@@ -186,7 +186,6 @@ $(POTDIR)/$(MODULE_NAME)/%.pot: \
 	@$(MKDIR) $(@D)
 	@touch $@
-
 #---[ Release Targets ]------------------------------------------------------------------
 all: \
@@ -226,7 +225,7 @@ $(BINRLS)/lib$(MODULE_NAME).static.a: \
 install: \
        $(foreach TARGET, $(TARGETS), install-$(TARGET))
-install-shared: \
+install-linux-lib: \
 	$(BINRLS)/lib$(MODULE_NAME)@LIBEXT@
 	@$(MKDIR) \
@@ -244,6 +243,31 @@ install-shared: \
 		lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \
 		$(DESTDIR)/$(libdir)/lib$(MODULE_NAME)@DLLEXT@
+install-windows-lib: \
+	$(BINRLS)/lib$(MODULE_NAME)@LIBEXT@
+
+	@$(MKDIR) \
+		$(DESTDIR)/$(bindir)
+
+	@$(INSTALL_PROGRAM) \
+		$(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ \
+		$(DESTDIR)/$(bindir)/lib$(MODULE_NAME)@LIBEXT@
+		
+	@$(MKDIR) \
+		$(DESTDIR)$(libdir)
+
+	@$(DLLTOOL) \
+		--input-def $(BINRLS)/lib$(MODULE_NAME).def \
+		--dllname lib$(MODULE_NAME).dll \
+		--output-lib $(DESTDIR)$(libdir)/lib$(MODULE_NAME).dll.a
+
+	@$(MKDIR) \
+		$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
+
+	@$(INSTALL_DATA) \
+		$(BINRLS)/lib$(MODULE_NAME).def \
+		$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
+
 install-static: \
 	$(BINRLS)/lib$(MODULE_NAME).static.a
@@ -283,28 +307,6 @@ 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: \
@@ -68,7 +68,7 @@ APP_LDFLAGS=&quot;&quot;
 DLL_LDFLAGS="-shared"
 CLIENT_LDFLAGS=""
 CLIENT_LIBS=""
-CLIENT_TARGETS="shared devel"
+CLIENT_TARGETS="devel"
 dnl ---------------------------------------------------------------------------
 dnl Check for OS specifics
@@ -80,11 +80,11 @@ case &quot;$host&quot; in
 		CFLAGS="$CFLAGS -D_WIN32_WINNT=0x0600"
 		LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32 -lkernel32"
 		LDFLAGS="$LDFLAGS"
-		CLIENT_LDFLAGS="-shared -static-libgcc -static-libstdc++ -Wl,--output-def,\$(@D)/\lib\$(MODULE_NAME).def,--out-implib,\$(@D)/\lib\$(MODULE_NAME).dll.a"
+		CLIENT_LDFLAGS="-shared -static-libgcc -static-libstdc++ -Wl,--output-def,\$(@D)/\lib\$(MODULE_NAME).def"
 		CLIENT_LIBS="-Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic"
 		DLLEXT=".dll"
-		CLIENT_TARGETS="$CLIENT_TARGETS winlib"
+		CLIENT_TARGETS="windows-lib $CLIENT_TARGETS"
 		app_win32_revision=$(date +%-y.%-m.%-d.%-H)
 		AC_SUBST(WIN32_VERSION,$app_win32_revision)
@@ -111,8 +111,9 @@ case &quot;$host&quot; in
 		DLLEXT=".so"
 		CLIENT_LDFLAGS="-shared"
-		app_cv_static='no'
+		CLIENT_TARGETS="linux-lib $CLIENT_TARGETS"
+		app_cv_static='no'
 esac