diff options
| author | Gunter Knauf <gk@gknw.de> | 2007-03-26 17:01:35 +0000 |
|---|---|---|
| committer | Gunter Knauf <gk@gknw.de> | 2007-03-26 17:01:35 +0000 |
| commit | 8272abef28e7202de84604cdefaded351883e333 (patch) | |
| tree | 3ac6a999df29444dc48be20587791f263d3cdb2b /src | |
| parent | 5fbc93c3eb057fd3c170c4e4f427e2cc7525ab70 (diff) | |
changed link lib order to make nlmconv happy.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.netware | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/src/Makefile.netware b/src/Makefile.netware index 2d450912a..71e8a276a 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -82,7 +82,7 @@ CFLAGS = $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc ifeq ($(CC),mwccnlm) LD = mwldnlm -LDFLAGS = -nostdlib $(PRELUDE) $(LDLIBS) $(OBJS) $(OBJX) -o $@ -commandfile +LDFLAGS = -nostdlib $(OBJS) $(PRELUDE) $(LDLIBS) -o $@ -commandfile LIBEXT = lib CFLAGS += -gccinc -inline off -opt nointrinsics -proc 586 CFLAGS += -relax_pointers @@ -115,24 +115,38 @@ SDK_LIBC = $(NDK_ROOT)/libc SDK_LDAP = $(NDK_ROOT)/cldapsdk/netware CURL_INC = ../include CURL_LIB = ../lib +ARES_LIB = ../ares INCLUDES = -I$(CURL_INC) -I$(CURL_LIB) ifdef LINK_STATIC - LDLIBS = ../lib/libcurl.$(LIBEXT) - IMPORTS = GetProcessSwitchCount RunningProcess + LDLIBS = $(CURL_LIB)/libcurl.$(LIBEXT) else MODULES = libcurl.nlm - IMPORTS = @../lib/libcurl.imp + IMPORTS = @$(CURL_LIB)/libcurl.imp endif ifdef WITH_ZLIB INCLUDES += -I$(ZLIB_PATH) ifdef LINK_STATIC LDLIBS += $(ZLIB_PATH)/nw/libz.$(LIBEXT) else - IMPORTS += @$(ZLIB_PATH)/nw/libz.imp MODULES += libz.nlm + IMPORTS += @$(ZLIB_PATH)/nw/libz.imp +endif endif +ifdef WITH_SSH2 + INCLUDES += -I$(LIBSSH2_PATH)/include +ifdef LINK_STATIC + LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT) +else + MODULES += libssh2.nlm + IMPORTS += @$(LIBSSH2_PATH)/nw/libssh2.imp +endif +endif +ifdef WITH_SSL + LDLIBS += $(OPENSSL_PATH)/out_nw_libc/ssl.$(LIBEXT) + LDLIBS += $(OPENSSL_PATH)/out_nw_libc/crypto.$(LIBEXT) + IMPORTS += GetProcessSwitchCount RunningProcess endif ifeq ($(LIBARCH),LIBC) @@ -169,10 +183,10 @@ endif # Makefile.inc provides the CSOURCES and HHEADERS defines include Makefile.inc -OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CURL_SOURCES))) OBJX := $(patsubst %.c,$(OBJDIR)/%.o,$(notdir $(strip $(CURLX_ONES)))) +OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CURL_SOURCES))) $(OBJX) -vpath %.c ../lib +vpath %.c $(CURL_LIB) all: prebuild $(TARGET).nlm |