From f14195f78613ede1cddae2d809705f0f90e139fe Mon Sep 17 00:00:00 2001
From: Gunter Knauf <gk@gknw.de>
Date: Mon, 22 Aug 2005 02:39:05 +0000
Subject: enabled statically linked builds.

---
 src/Makefile.netware | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.netware b/src/Makefile.netware
index e9e2de36e..6012ab489 100644
--- 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
-- 
cgit v1.2.3