From 978d666a807bf863cbe97256d21288228632f070 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 31 Jan 2019 15:55:15 -0200 Subject: [PATCH] Fixing windows build. --- configure.ac | 2 +- src/pw3270/Makefile.in | 33 +++++++++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 0d513ce..09def00 100644 --- a/configure.ac +++ b/configure.ac @@ -113,7 +113,7 @@ case "$host" in AC_CONFIG_FILES(win/$PACKAGE_TARNAME.nsi) AC_CONFIG_FILES(src/pw3270/resources.rc) - PLUGINS="$PLUGINS hllapi" +dnl PLUGINS="$PLUGINS hllapi" if test "$host_cpu" = "x86_64"; then app_cv_programfiles="PROGRAMFILES64" diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in index 2d1530e..6e9c2ec 100644 --- a/src/pw3270/Makefile.in +++ b/src/pw3270/Makefile.in @@ -229,7 +229,14 @@ $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@: \ $(BINRLS)/$(LIBNAME) \ $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC).o) - @$(LD) $(APP_LDFLAGS) -o $@ $^ -L$(BINRLS) $(LIBS) -l@PACKAGE_TARNAME@ + @$(LD) \ + $(LDFLAGS) \ + $(APP_LDFLAGS) \ + -o $@ \ + $^ \ + -L$(BINRLS) \ + $(LIBS) \ + -l@PACKAGE_TARNAME@ $(BINRLS)/$(LIBNAME): \ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ @@ -251,7 +258,12 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ @echo $(basename $@) ... @$(MKDIR) `dirname $@` - @$(LD) -shared -Wl,-soname,$(@F) $(LDFLAGS) -L$(BINRLS) -o $@ $^ $(LIBS) + @$(LD) \ + -shared -Wl,-soname,$(@F) \ + $(LDFLAGS) \ + -o $@ \ + $^ \ + $(LIBS) install: \ $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \ @@ -314,7 +326,14 @@ $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@: \ $(BINDBG)/$(LIBNAME) \ $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC).o) - @$(LD) -Wl,--rpath,$(BINDBG) -o $@ $^ -L$(BINDBG) $(LIBS) -l@PACKAGE_TARNAME@ + @$(LD) \ + $(LDFLAGS) \ + -Wl,--rpath,$(BINDBG) \ + -o $@ \ + $^ \ + -L$(BINDBG) \ + $(LIBS) \ + -l@PACKAGE_TARNAME@ $(BINDBG)/$(LIBNAME): \ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ @@ -336,7 +355,13 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ @echo $(basename $@) ... @$(MKDIR) `dirname $@` - @$(LD) -shared -Wl,-soname,$(@F) $(LDFLAGS) -L$(BINDBG) -o $@ $^ $(LIBS) + @$(LD) \ + -shared -Wl,-soname,$(@F) \ + $(LDFLAGS) \ + -L$(BINDBG) \ + -o $@ \ + $^ \ + $(LIBS) #---[ Clean Targets]--------------------------------------------------------------------- -- libgit2 0.21.2