From a4d995af0dc8784011c06a9f78d05b681caf7fd7 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 18 Jun 2015 14:45:22 +0200 Subject: [PATCH] GNUmakefile: add support for LIBSSH2_LDFLAG_EXTRAS It is similar to existing LIBSSH2_CFLAG_EXTRAS, but for extra linker options. Also delete some line/file ending whitespace. closes #27 --- win32/GNUmakefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/win32/GNUmakefile b/win32/GNUmakefile index da56ffa..d763138 100644 --- a/win32/GNUmakefile +++ b/win32/GNUmakefile @@ -111,11 +111,12 @@ endif # Global flags for all compilers CFLAGS = $(LIBSSH2_CFLAG_EXTRAS) $(OPT) -D$(DB) -DLIBSSH2_WIN32 # -DHAVE_CONFIG_H +LDFLAGS = $(LIBSSH2_LDFLAG_EXTRAS) ifeq ($(CC),mwcc) LD = mwld RC = mwwinrc -LDFLAGS = -nostdlib +LDFLAGS += -nostdlib AR = $(LD) ARFLAGS = -nostdlib -library -o LIBEXT = lib @@ -130,7 +131,7 @@ CFLAGS += -w on,nounused,nounusedexpr # -ansi strict else LD = $(CROSSPREFIX)gcc RC = $(CROSSPREFIX)windres -LDFLAGS = -s -shared -Wl,--output-def,$(TARGET).def,--out-implib,$(TARGET)dll.a +LDFLAGS += -s -shared -Wl,--output-def,$(TARGET).def,--out-implib,$(TARGET)dll.a AR = $(CROSSPREFIX)ar ARFLAGS = -cq LIBEXT = a @@ -226,7 +227,7 @@ prebuild: $(OBJDIR) $(OBJDIR)/version.inc test: all $(MAKE) -C test -f GNUmakefile - + $(OBJDIR)/%.o: %.c # @echo Compiling $< $(CC) $(CFLAGS) -c $< -o $@ @@ -342,5 +343,3 @@ help: $(OBJDIR)/version.inc @echo $(DL)$(MAKE) objclean$(DL) @echo $(DL)$(MAKE) test$(DL) @echo $(DL)===========================================================$(DL) - -