From 0f7ff3392b7cb047c95fd0c00e1cd013db3a02f1 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 17 Oct 2019 14:45:21 -0300 Subject: [PATCH] Checking module for side effects of the updates in the main library Updating package --- Makefile.in | 32 ++++++++++++++++---------------- configure.ac | 6 ++++-- src/testprogram/testprogram.cc | 2 +- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Makefile.in b/Makefile.in index 937d582..ee61cb6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -175,20 +175,24 @@ install: \ $(foreach PKG, $(INSTALL_PACKAGES), install-$(PKG)) -install-shared: \ +install-linux-lib: \ $(BINRLS)/$(SONAME) - # Install library - @$(MKDIR) $(DESTDIR)$(libdir) + @$(MKDIR) \ + $(DESTDIR)$(libdir) @$(INSTALL_PROGRAM) \ $(BINRLS)/$(SONAME) \ $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ - + @$(LN_S) \ $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ + @$(LN_S) \ + $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \ + $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@ + install-dev: # Install devel @@ -197,26 +201,23 @@ install-dev: src/include/lib3270/*.h \ $(DESTDIR)$(includedir)/lib3270 - @$(MKDIR) $(DESTDIR)$(libdir) - @$(LN_S) \ - $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \ - $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@ - - -install-winlib: \ +install-windows-lib: \ $(BINRLS)/$(SONAME) @$(MKDIR) \ - $(DESTDIR)$(libdir) + $(DESTDIR)$(bindir) - @$(INSTALL_DATA) \ - $(BINRLS)/$(LIBNAME).dll.a \ + @$(INSTALL_PROGRAM) \ + $(BINRLS)/$(SONAME) \ + $(DESTDIR)$(bindir)/$(LIBNAME)@DLLEXT@ + + @$(MKDIR) \ $(DESTDIR)$(libdir) @$(DLLTOOL) \ --input-def $(BINRLS)/$(LIBNAME).def \ --dllname $(LIBNAME).dll \ - --output-lib $(DESTDIR)$(libdir)/$(LIBNAME).lib + --output-lib $(DESTDIR)$(libdir)/$(LIBNAME).dll.a @$(MKDIR) \ $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def @@ -245,7 +246,6 @@ $(BINDBG)/$(LIBNAME)@EXEEXT@: \ $^ \ -L$(BINDBG) \ -Wl,-rpath,$(BINDBG) \ - $(LDFLAGS) \ $(LIBS) run: \ diff --git a/configure.ac b/configure.ac index 65581aa..d51621a 100644 --- a/configure.ac +++ b/configure.ac @@ -92,7 +92,7 @@ AC_SUBST(APPDATADIR,$app_cv_source_appdatadir) dnl --------------------------------------------------------------------------- dnl Check for OS specifics dnl --------------------------------------------------------------------------- -INSTALL_PACKAGES="shared dev" +INSTALL_PACKAGES="dev" case "$host" in *-mingw32|*-pc-msys) @@ -100,7 +100,7 @@ case "$host" in CFLAGS="$CFLAGS -D_WIN32_WINNT=0x0600" LDFLAGS="$LDFLAGS -shared -Wl,--output-def,\$(@D)/\$(LIBNAME).def,--out-implib,\$(@D)/\$(LIBNAME).dll.a" - INSTALL_PACKAGES="$INSTALL_PACKAGES winlib" + INSTALL_PACKAGES="windows-lib $INSTALL_PACKAGES" LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32" DLLEXT=".dll" @@ -131,6 +131,8 @@ case "$host" in *) CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS -shared" + INSTALL_PACKAGES="linux-lib $INSTALL_PACKAGES" + app_cv_datadir="/usr/share" app_cv_confdir="/etc" app_cv_osname="linux" diff --git a/src/testprogram/testprogram.cc b/src/testprogram/testprogram.cc index 268bed4..4363ebb 100644 --- a/src/testprogram/testprogram.cc +++ b/src/testprogram/testprogram.cc @@ -44,7 +44,7 @@ char buffer[SCREEN_LENGTH+1]; const char *host = ""; - const char *session = ""; // "pw3270:a"; + const char *session = ":a"; #pragma GCC diagnostic push static struct option options[] = -- libgit2 0.21.2