Commit 87fc4ad9 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

changed to use libssh2 0.16; 

fixed link order in case libssh2 is build with zlib.
parent b2142989

lib/Makefile.netware

+10 −10
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ endif 


# Edit the path below to point to the base of your LibSSH2 package.

ifndef LIBSSH2_PATH

LIBSSH2_PATH = ../../libssh2-0.15

LIBSSH2_PATH = ../../libssh2-0.16

endif



ifndef INSTDIR
@@ -145,15 +145,6 @@ ifdef WITH_ARES 
	INCLUDES += -I$(ARES_LIB)

	LDLIBS += $(ARES_LIB)/libcares.$(LIBEXT)

endif

ifdef WITH_ZLIB

	INCLUDES += -I$(ZLIB_PATH)

ifdef LINK_STATIC

	LDLIBS += $(ZLIB_PATH)/nw/$(LIBARCH)/libz.$(LIBEXT)

else

	MODULES += libz.nlm

	IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp

endif

endif

ifdef WITH_SSH2

	INCLUDES += -I$(LIBSSH2_PATH)/include

ifdef LINK_STATIC
@@ -169,6 +160,15 @@ ifdef WITH_SSL 
	LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)

	IMPORTS += GetProcessSwitchCount RunningProcess

endif

ifdef WITH_ZLIB

	INCLUDES += -I$(ZLIB_PATH)

ifdef LINK_STATIC

	LDLIBS += $(ZLIB_PATH)/nw/$(LIBARCH)/libz.$(LIBEXT)

else

	MODULES += libz.nlm

	IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp

endif

endif



ifeq ($(LIBARCH),LIBC)

	INCLUDES += -I$(SDK_LIBC)/include

src/Makefile.netware

+10 −10
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ endif 


# Edit the path below to point to the base of your LibSSH2 package.

ifndef LIBSSH2_PATH

LIBSSH2_PATH = ../../libssh2-0.15

LIBSSH2_PATH = ../../libssh2-0.16

endif



ifndef INSTDIR
@@ -144,15 +144,6 @@ else 
	MODULES	= libcurl.nlm

	IMPORTS	= @$(CURL_LIB)/libcurl.imp

endif

ifdef WITH_ZLIB

	INCLUDES += -I$(ZLIB_PATH)

ifdef LINK_STATIC

	LDLIBS += $(ZLIB_PATH)/nw/$(LIBARCH)/libz.$(LIBEXT)

else

	MODULES += libz.nlm

	IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp

endif

endif

ifdef WITH_SSH2

	INCLUDES += -I$(LIBSSH2_PATH)/include

ifdef LINK_STATIC
@@ -167,6 +158,15 @@ ifdef WITH_SSL 
	LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)

	IMPORTS += GetProcessSwitchCount RunningProcess

endif

ifdef WITH_ZLIB

	INCLUDES += -I$(ZLIB_PATH)

ifdef LINK_STATIC

	LDLIBS += $(ZLIB_PATH)/nw/$(LIBARCH)/libz.$(LIBEXT)

else

	MODULES += libz.nlm

	IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp

endif

endif



ifeq ($(LIBARCH),LIBC)

	INCLUDES += -I$(SDK_LIBC)/include