diff options
| author | Gunter Knauf <gk@gknw.de> | 2007-08-04 23:35:23 +0000 |
|---|---|---|
| committer | Gunter Knauf <gk@gknw.de> | 2007-08-04 23:35:23 +0000 |
| commit | 87fc4ad9190eeee8215145b425e83a2da9617f7f (patch) | |
| tree | dceef5a52224792791942863fabd61c0cfb59f1f | |
| parent | b214298960068fc4ff82848def7c9c4e781ec673 (diff) | |
changed to use libssh2 0.16;
fixed link order in case libssh2 is build with zlib.
| -rw-r--r-- | lib/Makefile.netware | 20 | ||||
| -rw-r--r-- | src/Makefile.netware | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/lib/Makefile.netware b/lib/Makefile.netware index e5ee92246..db8cb78e4 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -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 diff --git a/src/Makefile.netware b/src/Makefile.netware index 762174ee3..4a12dc6f4 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -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 |