Commit 978d666a807bf863cbe97256d21288228632f070
1 parent
1afaf7c0
Exists in
master
and in
5 other branches
Fixing windows build.
Showing
2 changed files
with
30 additions
and
5 deletions
Show diff stats
configure.ac
@@ -113,7 +113,7 @@ case "$host" in | @@ -113,7 +113,7 @@ case "$host" in | ||
113 | AC_CONFIG_FILES(win/$PACKAGE_TARNAME.nsi) | 113 | AC_CONFIG_FILES(win/$PACKAGE_TARNAME.nsi) |
114 | AC_CONFIG_FILES(src/pw3270/resources.rc) | 114 | AC_CONFIG_FILES(src/pw3270/resources.rc) |
115 | 115 | ||
116 | - PLUGINS="$PLUGINS hllapi" | 116 | +dnl PLUGINS="$PLUGINS hllapi" |
117 | 117 | ||
118 | if test "$host_cpu" = "x86_64"; then | 118 | if test "$host_cpu" = "x86_64"; then |
119 | app_cv_programfiles="PROGRAMFILES64" | 119 | app_cv_programfiles="PROGRAMFILES64" |
src/pw3270/Makefile.in
@@ -229,7 +229,14 @@ $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@: \ | @@ -229,7 +229,14 @@ $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@: \ | ||
229 | $(BINRLS)/$(LIBNAME) \ | 229 | $(BINRLS)/$(LIBNAME) \ |
230 | $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC).o) | 230 | $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC).o) |
231 | 231 | ||
232 | - @$(LD) $(APP_LDFLAGS) -o $@ $^ -L$(BINRLS) $(LIBS) -l@PACKAGE_TARNAME@ | 232 | + @$(LD) \ |
233 | + $(LDFLAGS) \ | ||
234 | + $(APP_LDFLAGS) \ | ||
235 | + -o $@ \ | ||
236 | + $^ \ | ||
237 | + -L$(BINRLS) \ | ||
238 | + $(LIBS) \ | ||
239 | + -l@PACKAGE_TARNAME@ | ||
233 | 240 | ||
234 | $(BINRLS)/$(LIBNAME): \ | 241 | $(BINRLS)/$(LIBNAME): \ |
235 | $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ | 242 | $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ |
@@ -251,7 +258,12 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ | @@ -251,7 +258,12 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ | ||
251 | 258 | ||
252 | @echo $(basename $@) ... | 259 | @echo $(basename $@) ... |
253 | @$(MKDIR) `dirname $@` | 260 | @$(MKDIR) `dirname $@` |
254 | - @$(LD) -shared -Wl,-soname,$(@F) $(LDFLAGS) -L$(BINRLS) -o $@ $^ $(LIBS) | 261 | + @$(LD) \ |
262 | + -shared -Wl,-soname,$(@F) \ | ||
263 | + $(LDFLAGS) \ | ||
264 | + -o $@ \ | ||
265 | + $^ \ | ||
266 | + $(LIBS) | ||
255 | 267 | ||
256 | install: \ | 268 | install: \ |
257 | $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \ | 269 | $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \ |
@@ -314,7 +326,14 @@ $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@: \ | @@ -314,7 +326,14 @@ $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@: \ | ||
314 | $(BINDBG)/$(LIBNAME) \ | 326 | $(BINDBG)/$(LIBNAME) \ |
315 | $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC).o) | 327 | $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC).o) |
316 | 328 | ||
317 | - @$(LD) -Wl,--rpath,$(BINDBG) -o $@ $^ -L$(BINDBG) $(LIBS) -l@PACKAGE_TARNAME@ | 329 | + @$(LD) \ |
330 | + $(LDFLAGS) \ | ||
331 | + -Wl,--rpath,$(BINDBG) \ | ||
332 | + -o $@ \ | ||
333 | + $^ \ | ||
334 | + -L$(BINDBG) \ | ||
335 | + $(LIBS) \ | ||
336 | + -l@PACKAGE_TARNAME@ | ||
318 | 337 | ||
319 | $(BINDBG)/$(LIBNAME): \ | 338 | $(BINDBG)/$(LIBNAME): \ |
320 | $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ | 339 | $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ |
@@ -336,7 +355,13 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ | @@ -336,7 +355,13 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ | ||
336 | 355 | ||
337 | @echo $(basename $@) ... | 356 | @echo $(basename $@) ... |
338 | @$(MKDIR) `dirname $@` | 357 | @$(MKDIR) `dirname $@` |
339 | - @$(LD) -shared -Wl,-soname,$(@F) $(LDFLAGS) -L$(BINDBG) -o $@ $^ $(LIBS) | 358 | + @$(LD) \ |
359 | + -shared -Wl,-soname,$(@F) \ | ||
360 | + $(LDFLAGS) \ | ||
361 | + -L$(BINDBG) \ | ||
362 | + -o $@ \ | ||
363 | + $^ \ | ||
364 | + $(LIBS) | ||
340 | 365 | ||
341 | 366 | ||
342 | #---[ Clean Targets]--------------------------------------------------------------------- | 367 | #---[ Clean Targets]--------------------------------------------------------------------- |