diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2004-06-04 07:02:30 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2004-06-04 07:02:30 +0000 |
| commit | 0b04c521198dcb5de1b5c1e7e27f0d27098a1481 (patch) | |
| tree | 8176b55d858badcdcecb663e879fc1f073bfd53f /lib/Makefile.netware | |
| parent | 8383945acc6460756d77e4ca8062f1376b126c5a (diff) | |
Günter Knauf's netware build fixes
Diffstat (limited to 'lib/Makefile.netware')
| -rw-r--r-- | lib/Makefile.netware | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 8275e143b..4b88d00db 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -12,7 +12,7 @@ BASE = c:/novell INSTDIR = s:/libcurl # Edit the path below to point to the base of your Zlib sources. -ZLIB_PATH = ../../../cw/zlib-src-1.1.4 +#ZLIB_PATH = ../../../cw/zlib-src-1.1.4 # Edit the vars below to change NLM target settings. TARGET = libcurl @@ -22,7 +22,6 @@ DESCR = cURL libcurl $(LIBCURL_VERSION_STR) - http://curl.haxx.se MTSAFE = YES STACK = 64000 SCREEN = none -#MODULES = libz.nlm EXPORTS = @libcurl.imp # Edit the var below to point to your lib architecture. @@ -99,10 +98,15 @@ NDK_ROOT = $(BASE)/ndk SDK_CLIB = $(NDK_ROOT)/nwsdk SDK_LIBC = $(NDK_ROOT)/libc SDK_LDAP = $(NDK_ROOT)/cldapsdk/netware -CURL_INC = ../include -INCLUDES = -I$(CURL_INC) -INCLUDES += -I$(ZLIB_PATH) +INCLUDES = -I. -I../include + +ifdef ZLIB_PATH + INCLUDES += -I$(ZLIB_PATH) + CFLAGS += -DHAVE_ZLIB_H -DHAVE_LIBZ + IMPORTS = @$(ZLIB_PATH)/nw/zlib.imp + MODULES = libz.nlm +endif ifeq ($(LIBARCH),LIBC) INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks @@ -122,7 +126,7 @@ endif ifeq ($(OSTYPE),linux) DL = ' --include $(BASE)/nlmconv/ncpfs.inc +#-include $(BASE)/nlmconv/ncpfs.inc endif OBJS = \ @@ -169,6 +173,14 @@ OBJS = \ $(OBJDIR)/http_ntlm.o \ $(OBJDIR)/md5.o \ $(OBJDIR)/strtoofft.o \ + $(OBJDIR)/strerror.o \ + $(OBJDIR)/hostares.o \ + $(OBJDIR)/hostasyn.o \ + $(OBJDIR)/hostip4.o \ + $(OBJDIR)/hostip6.o \ + $(OBJDIR)/hostsyn.o \ + $(OBJDIR)/hostthre.o \ + $(OBJDIR)/inet_ntop.o \ $(OBJDIR)/nwlib.o @@ -178,9 +190,9 @@ $(OBJDIR)/%.o: %.c @echo Compiling $< @$(CC) $(CFLAGS) -c $< -o $@ -$(OBJDIR)/version.inc: $(CURL_INC)/curl/curl.h $(OBJDIR) +$(OBJDIR)/version.inc: ../include/curl/curlver.h $(OBJDIR) @echo Creating $@ - @awk -f ../packages/netware/get_ver.awk $< > $@ + @awk -f ../packages/NetWare/get_ver.awk $< > $@ dist: all -$(RM) $(OBJDIR)/*.o $(OBJDIR)/$(TARGET).map $(OBJDIR)/$(TARGET).ncv @@ -239,9 +251,9 @@ ifeq ($(LIBARCH),CLIB) @echo $(DL)import @$(SDK_CLIB)/imports/threads.imp$(DL) >> $@ @echo $(DL)import @$(SDK_CLIB)/imports/nlmlib.imp$(DL) >> $@ @echo $(DL)import @$(SDK_CLIB)/imports/socklib.imp$(DL) >> $@ - @echo $(DL)import @$(SDK_LDAP)/clib/imports/ldapsdk.imp$(DL) >> $@ - @echo $(DL)import @$(SDK_LDAP)/clib/imports/ldapssl.imp$(DL) >> $@ - @echo $(DL)import @$(SDK_LDAP)/clib/imports/ldapx.imp$(DL) >> $@ +# @echo $(DL)import @$(SDK_LDAP)/clib/imports/ldapsdk.imp$(DL) >> $@ +# @echo $(DL)import @$(SDK_LDAP)/clib/imports/ldapssl.imp$(DL) >> $@ +# @echo $(DL)import @$(SDK_LDAP)/clib/imports/ldapx.imp$(DL) >> $@ @echo $(DL)module clib$(DL) >> $@ else ifeq ($(LD),nlmconv) @@ -255,9 +267,9 @@ endif @echo $(DL)check _LibCCheckUnload$(DL) >> $@ @echo $(DL)import @$(SDK_LIBC)/imports/libc.imp$(DL) >> $@ @echo $(DL)import @$(SDK_LIBC)/imports/netware.imp$(DL) >> $@ - @echo $(DL)import @$(SDK_LDAP)/libc/imports/lldapsdk.imp$(DL) >> $@ - @echo $(DL)import @$(SDK_LDAP)/libc/imports/lldapssl.imp$(DL) >> $@ - @echo $(DL)import @$(SDK_LDAP)/libc/imports/lldapx.imp$(DL) >> $@ +# @echo $(DL)import @$(SDK_LDAP)/libc/imports/lldapsdk.imp$(DL) >> $@ +# @echo $(DL)import @$(SDK_LDAP)/libc/imports/lldapssl.imp$(DL) >> $@ +# @echo $(DL)import @$(SDK_LDAP)/libc/imports/lldapx.imp$(DL) >> $@ @echo $(DL)module libc$(DL) >> $@ endif ifdef MODULES |