enabled statically linked builds.

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index d19dc5e..07b867a 100644 (file)
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -105,8 +105,6 @@ else
 endif
 endif
 
-LDLIBS =
-
 NDK_ROOT = $(NDKBASE)/ndk
 SDK_CLIB = $(NDK_ROOT)/nwsdk
 SDK_LIBC = $(NDK_ROOT)/libc
@@ -116,18 +114,22 @@ INCLUDES = -I. -I../include
 
 ifdef WITH_ARES
        INCLUDES += -I../ares
-       LIBCARES = ../ares/libcares.lib
-endif
-ifdef WITH_ZLIB
-       INCLUDES += -I$(ZLIB_PATH)
-       IMPORTS = @$(ZLIB_PATH)/nw/libz.imp
-       MODULES = libz.nlm
+       LDLIBS = ../ares/libcares.lib
 endif
 ifdef WITH_SSL
        INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_libc -I$(OPENSSL_PATH)/outinc_nw_libc/openssl
-       LIBSSL = $(OPENSSL_PATH)/out_nw_libc/crypto.lib $(OPENSSL_PATH)/out_nw_libc/ssl.lib
+       LDLIBS += $(OPENSSL_PATH)/out_nw_libc/crypto.lib $(OPENSSL_PATH)/out_nw_libc/ssl.lib
        IMPORTS += GetProcessSwitchCount RunningProcess
 endif
+ifdef WITH_ZLIB
+       INCLUDES += -I$(ZLIB_PATH)
+ifdef LINK_STATIC
+       LDLIBS += $(ZLIB_PATH)/nw/libz.lib
+else
+       IMPORTS += @$(ZLIB_PATH)/nw/libz.imp
+       MODULES += libz.nlm
+endif
+endif
 
 ifeq ($(LIBARCH),LIBC)
        INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks
@@ -164,7 +166,7 @@ endif
 # Makefile.inc provides the CSOURCES and HHEADERS defines
 include Makefile.inc
 
-OBJS   := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CSOURCES))) $(LIBCARES) $(LIBSSL)
+OBJS   := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CSOURCES))) $(LDLIBS)
 
 OBJL   = $(OBJS) $(OBJDIR)/nwlib.o
 
@@ -283,11 +285,8 @@ ifdef IMPORTS
        @echo $(DL)import $(IMPORTS)$(DL) >> $@
 endif
 ifeq ($(LD),nlmconv)
-ifdef WITH_ARES
-       @echo $(DL)input $(LIBCARES)$(DL) >> $@
-endif
-ifdef WITH_SSL
-       @echo $(DL)input $(LIBSSL)$(DL) >> $@
+ifdef LDLIBS
+       @echo $(DL)input $(LDLIBS)$(DL) >> $@
 endif
        @echo $(DL)input $(OBJL)$(DL) >> $@
        @echo $(DL)input $(PRELUDE)$(DL) >> $@

diff --git a/src/Makefile.netware b/src/Makefile.netware
index e9e2de3..6012ab4 100644 (file)
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -34,8 +34,6 @@ DESCR = cURL $(LIBCURL_VERSION_STR) - http://curl.haxx.se
 MTSAFE = YES
 STACK  = 64000
 SCREEN = $(TARGET) commandline utility
-MODULES        = libcurl.nlm
-IMPORTS        = @../lib/libcurl.imp
 # Comment the line below if you dont want to load protected automatically.
 LDRING = 3
 
@@ -77,7 +75,7 @@ CFLAGS        = $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc
 
 ifeq ($(CC),mwccnlm)
 LD     = mwldnlm
-LDFLAGS        = -nostdlib $(PRELUDE) $(OBJDIR)/*.o -o $(TARGET).nlm -commandfile
+LDFLAGS        = -nostdlib $(PRELUDE) $(LDLIBS) $(OBJS) $(OBJX) -o $(TARGET).nlm -commandfile
 CFLAGS += -gccinc -inline off -opt nointrinsics -proc 586
 CFLAGS += -relax_pointers
 #CFLAGS        += -w on
@@ -102,8 +100,6 @@ else
 endif
 endif
 
-LDLIBS =
-
 NDK_ROOT = $(NDKBASE)/ndk
 SDK_CLIB = $(NDK_ROOT)/nwsdk
 SDK_LIBC = $(NDK_ROOT)/libc
@@ -113,11 +109,22 @@ CURL_LIB = ../lib
 
 INCLUDES = -I$(CURL_INC) -I$(CURL_LIB)
 
+ifdef LINK_STATIC
+       LDLIBS  = ../lib/libcurl.lib
+       IMPORTS = GetProcessSwitchCount RunningProcess
+else
+       MODULES = libcurl.nlm
+       IMPORTS = @../lib/libcurl.imp
+endif
 ifdef WITH_ZLIB
        INCLUDES += -I$(ZLIB_PATH)
-       IMPORTS += @$(ZLIB_PATH)/nw/zlib.imp
+ifdef LINK_STATIC
+       LDLIBS += $(ZLIB_PATH)/nw/libz.lib
+else
+       IMPORTS += @$(ZLIB_PATH)/nw/libz.imp
        MODULES += libz.nlm
 endif
+endif
 
 ifeq ($(LIBARCH),LIBC)
        INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks