|
@@ -31,7 +31,7 @@
|
|
|
|
|
|
# Edit the path below to point to the base of your Novell NDK.
|
|
|
ifndef NDKBASE
|
|
|
-NDKBASE = c:/novell
|
|
|
+NDKBASE = c:/novell
|
|
|
endif
|
|
|
|
|
|
# Edit the path below to point to the base of your Zlib sources.
|
|
@@ -80,19 +80,19 @@ LIBCARES_PATH = ../ares
|
|
|
endif
|
|
|
|
|
|
ifndef INSTDIR
|
|
|
-INSTDIR = ..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw
|
|
|
+INSTDIR = ..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw
|
|
|
endif
|
|
|
|
|
|
# Edit the vars below to change NLM target settings.
|
|
|
TARGET = libcurl
|
|
|
-VERSION = $(LIBCURL_VERSION)
|
|
|
-COPYR = Copyright (C) $(LIBCURL_COPYRIGHT_STR)
|
|
|
-DESCR = curl libcurl $(LIBCURL_VERSION_STR) ($(LIBARCH)) - https://curl.haxx.se
|
|
|
-MTSAFE = YES
|
|
|
-STACK = 64000
|
|
|
-SCREEN = none
|
|
|
-EXPORTF = $(TARGET).imp
|
|
|
-EXPORTS = @$(EXPORTF)
|
|
|
+VERSION = $(LIBCURL_VERSION)
|
|
|
+COPYR = Copyright (C) $(LIBCURL_COPYRIGHT_STR)
|
|
|
+DESCR = curl libcurl $(LIBCURL_VERSION_STR) ($(LIBARCH)) - https://curl.haxx.se
|
|
|
+MTSAFE = YES
|
|
|
+STACK = 64000
|
|
|
+SCREEN = none
|
|
|
+EXPORTF = $(TARGET).imp
|
|
|
+EXPORTS = @$(EXPORTF)
|
|
|
|
|
|
# Uncomment the next line to enable linking with POSIX semantics.
|
|
|
# POSIXFL = 1
|
|
@@ -104,39 +104,39 @@ endif
|
|
|
|
|
|
# must be equal to NDEBUG or DEBUG, CURLDEBUG
|
|
|
ifndef DB
|
|
|
-DB = NDEBUG
|
|
|
+DB = NDEBUG
|
|
|
endif
|
|
|
# Optimization: -O<n> or debugging: -g
|
|
|
ifeq ($(DB),NDEBUG)
|
|
|
- OPT = -O2
|
|
|
- OBJDIR = release
|
|
|
+ OPT = -O2
|
|
|
+ OBJDIR = release
|
|
|
else
|
|
|
- OPT = -g
|
|
|
- OBJDIR = debug
|
|
|
+ OPT = -g
|
|
|
+ OBJDIR = debug
|
|
|
endif
|
|
|
|
|
|
# The following lines defines your compiler.
|
|
|
ifdef CWFolder
|
|
|
- METROWERKS = $(CWFolder)
|
|
|
+ METROWERKS = $(CWFolder)
|
|
|
endif
|
|
|
ifdef METROWERKS
|
|
|
- # MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support
|
|
|
- MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support
|
|
|
- CC = mwccnlm
|
|
|
+ # MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support
|
|
|
+ MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support
|
|
|
+ CC = mwccnlm
|
|
|
else
|
|
|
- CC = gcc
|
|
|
+ CC = gcc
|
|
|
endif
|
|
|
-PERL = perl
|
|
|
+PERL = perl
|
|
|
# Here you can find a native Win32 binary of the original awk:
|
|
|
# http://www.gknw.net/development/prgtools/awk-20100523.zip
|
|
|
-AWK = awk
|
|
|
-CP = cp -afv
|
|
|
-MKDIR = mkdir
|
|
|
-# RM = rm -f
|
|
|
+AWK = awk
|
|
|
+CP = cp -afv
|
|
|
+MKDIR = mkdir
|
|
|
+# RM = rm -f
|
|
|
# If you want to mark the target as MTSAFE you will need a tool for
|
|
|
# generating the xdc data for the linker; here's a minimal tool:
|
|
|
# http://www.gknw.net/development/prgtools/mkxdc.zip
|
|
|
-MPKXDC = mkxdc
|
|
|
+MPKXDC = mkxdc
|
|
|
|
|
|
# LIBARCH_U = $(shell $(AWK) 'BEGIN {print toupper(ARGV[1])}' $(LIBARCH))
|
|
|
LIBARCH_L = $(shell $(AWK) 'BEGIN {print tolower(ARGV[1])}' $(LIBARCH))
|
|
@@ -145,58 +145,58 @@ LIBARCH_L = $(shell $(AWK) 'BEGIN {print tolower(ARGV[1])}' $(LIBARCH))
|
|
|
-include $(OBJDIR)/version.inc
|
|
|
|
|
|
# Global flags for all compilers
|
|
|
-CFLAGS += $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc
|
|
|
+CFLAGS += $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc
|
|
|
|
|
|
ifeq ($(CC),mwccnlm)
|
|
|
-LD = mwldnlm
|
|
|
-LDFLAGS = -nostdlib $(PRELUDE) $(OBJL) -o $@ -commandfile
|
|
|
-AR = mwldnlm
|
|
|
-ARFLAGS = -nostdlib -type library -o
|
|
|
-LIBEXT = lib
|
|
|
-#RANLIB =
|
|
|
-CFLAGS += -msgstyle gcc -gccinc -inline off -opt nointrinsics -proc 586
|
|
|
-CFLAGS += -relax_pointers
|
|
|
-#CFLAGS += -w on
|
|
|
-ifeq ($(LIBARCH),LIBC)
|
|
|
-ifeq ($(POSIXFL),1)
|
|
|
- PRELUDE = $(NDK_LIBC)/imports/posixpre.o
|
|
|
-else
|
|
|
- PRELUDE = $(NDK_LIBC)/imports/libcpre.o
|
|
|
-endif
|
|
|
- CFLAGS += -align 4
|
|
|
-else
|
|
|
- # PRELUDE = $(NDK_CLIB)/imports/clibpre.o
|
|
|
- # to avoid the __init_* / __deinit_* woes don't use prelude from NDK
|
|
|
- PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj"
|
|
|
- # CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h"
|
|
|
- CFLAGS += -align 1
|
|
|
-endif
|
|
|
+ LD = mwldnlm
|
|
|
+ LDFLAGS = -nostdlib $(PRELUDE) $(OBJL) -o $@ -commandfile
|
|
|
+ AR = mwldnlm
|
|
|
+ ARFLAGS = -nostdlib -type library -o
|
|
|
+ LIBEXT = lib
|
|
|
+ #RANLIB =
|
|
|
+ CFLAGS += -msgstyle gcc -gccinc -inline off -opt nointrinsics -proc 586
|
|
|
+ CFLAGS += -relax_pointers
|
|
|
+ #CFLAGS += -w on
|
|
|
+ ifeq ($(LIBARCH),LIBC)
|
|
|
+ ifeq ($(POSIXFL),1)
|
|
|
+ PRELUDE = $(NDK_LIBC)/imports/posixpre.o
|
|
|
+ else
|
|
|
+ PRELUDE = $(NDK_LIBC)/imports/libcpre.o
|
|
|
+ endif
|
|
|
+ CFLAGS += -align 4
|
|
|
+ else
|
|
|
+ # PRELUDE = $(NDK_CLIB)/imports/clibpre.o
|
|
|
+ # to avoid the __init_* / __deinit_* woes don't use prelude from NDK
|
|
|
+ PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj"
|
|
|
+ # CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h"
|
|
|
+ CFLAGS += -align 1
|
|
|
+ endif
|
|
|
else
|
|
|
-LD = nlmconv
|
|
|
-LDFLAGS = -T
|
|
|
-AR = ar
|
|
|
-ARFLAGS = -cq
|
|
|
-LIBEXT = a
|
|
|
-RANLIB = ranlib
|
|
|
-CFLAGS += -m32
|
|
|
-CFLAGS += -fno-builtin -fno-strict-aliasing
|
|
|
-ifeq ($(findstring gcc,$(CC)),gcc)
|
|
|
-CFLAGS += -fpcc-struct-return
|
|
|
-endif
|
|
|
-CFLAGS += -Wall # -pedantic
|
|
|
-ifeq ($(LIBARCH),LIBC)
|
|
|
-ifeq ($(POSIXFL),1)
|
|
|
- PRELUDE = $(NDK_LIBC)/imports/posixpre.gcc.o
|
|
|
-else
|
|
|
- PRELUDE = $(NDK_LIBC)/imports/libcpre.gcc.o
|
|
|
-endif
|
|
|
-else
|
|
|
- PRELUDE = $(NDK_CLIB)/imports/clibpre.gcc.o
|
|
|
- # to avoid the __init_* / __deinit_* woes don't use prelude from NDK
|
|
|
- # http://www.gknw.net/development/mk_nlm/gcc_pre.zip
|
|
|
- # PRELUDE = $(NDK_ROOT)/pre/prelude.o
|
|
|
- CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
|
|
|
-endif
|
|
|
+ LD = nlmconv
|
|
|
+ LDFLAGS = -T
|
|
|
+ AR = ar
|
|
|
+ ARFLAGS = -cq
|
|
|
+ LIBEXT = a
|
|
|
+ RANLIB = ranlib
|
|
|
+ CFLAGS += -m32
|
|
|
+ CFLAGS += -fno-builtin -fno-strict-aliasing
|
|
|
+ ifeq ($(findstring gcc,$(CC)),gcc)
|
|
|
+ CFLAGS += -fpcc-struct-return
|
|
|
+ endif
|
|
|
+ CFLAGS += -Wall # -pedantic
|
|
|
+ ifeq ($(LIBARCH),LIBC)
|
|
|
+ ifeq ($(POSIXFL),1)
|
|
|
+ PRELUDE = $(NDK_LIBC)/imports/posixpre.gcc.o
|
|
|
+ else
|
|
|
+ PRELUDE = $(NDK_LIBC)/imports/libcpre.gcc.o
|
|
|
+ endif
|
|
|
+ else
|
|
|
+ PRELUDE = $(NDK_CLIB)/imports/clibpre.gcc.o
|
|
|
+ # to avoid the __init_* / __deinit_* woes don't use prelude from NDK
|
|
|
+ # http://www.gknw.net/development/mk_nlm/gcc_pre.zip
|
|
|
+ # PRELUDE = $(NDK_ROOT)/pre/prelude.o
|
|
|
+ CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
|
|
|
+ endif
|
|
|
endif
|
|
|
|
|
|
NDK_ROOT = $(NDKBASE)/ndk
|
|
@@ -257,99 +257,99 @@ ENABLE_IPV6 = 1
|
|
|
endif
|
|
|
|
|
|
ifdef WITH_ARES
|
|
|
- INCLUDES += -I$(LIBCARES_PATH)
|
|
|
- LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT)
|
|
|
+ INCLUDES += -I$(LIBCARES_PATH)
|
|
|
+ LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT)
|
|
|
endif
|
|
|
ifdef WITH_SSH2
|
|
|
- INCLUDES += -I$(LIBSSH2_PATH)/include
|
|
|
+ INCLUDES += -I$(LIBSSH2_PATH)/include
|
|
|
ifdef LINK_STATIC
|
|
|
- LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT)
|
|
|
+ LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT)
|
|
|
else
|
|
|
- MODULES += libssh2.nlm
|
|
|
- IMPORTS += @$(LIBSSH2_PATH)/nw/libssh2.imp
|
|
|
+ MODULES += libssh2.nlm
|
|
|
+ IMPORTS += @$(LIBSSH2_PATH)/nw/libssh2.imp
|
|
|
endif
|
|
|
endif
|
|
|
ifdef WITH_RTMP
|
|
|
- INCLUDES += -I$(LIBRTMP_PATH)
|
|
|
- LDLIBS += $(LIBRTMP_PATH)/librtmp/librtmp.$(LIBEXT)
|
|
|
+ INCLUDES += -I$(LIBRTMP_PATH)
|
|
|
+ LDLIBS += $(LIBRTMP_PATH)/librtmp/librtmp.$(LIBEXT)
|
|
|
endif
|
|
|
ifdef WITH_SSL
|
|
|
- INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)
|
|
|
- LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT)
|
|
|
- LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
|
|
|
- IMPORTS += GetProcessSwitchCount RunningProcess
|
|
|
- INSTDEP += ca-bundle.crt
|
|
|
+ INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)
|
|
|
+ LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT)
|
|
|
+ LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
|
|
|
+ IMPORTS += GetProcessSwitchCount RunningProcess
|
|
|
+ INSTDEP += ca-bundle.crt
|
|
|
else
|
|
|
ifdef WITH_AXTLS
|
|
|
- INCLUDES += -I$(AXTLS_PATH)/inc
|
|
|
-ifdef LINK_STATIC
|
|
|
- LDLIBS += $(AXTLS_PATH)/lib/libaxtls.$(LIBEXT)
|
|
|
-else
|
|
|
- MODULES += libaxtls.nlm
|
|
|
- IMPORTS += $(AXTLS_PATH)/lib/libaxtls.imp
|
|
|
-endif
|
|
|
- INSTDEP += ca-bundle.crt
|
|
|
+ INCLUDES += -I$(AXTLS_PATH)/inc
|
|
|
+ ifdef LINK_STATIC
|
|
|
+ LDLIBS += $(AXTLS_PATH)/lib/libaxtls.$(LIBEXT)
|
|
|
+ else
|
|
|
+ MODULES += libaxtls.nlm
|
|
|
+ IMPORTS += $(AXTLS_PATH)/lib/libaxtls.imp
|
|
|
+ endif
|
|
|
+ INSTDEP += ca-bundle.crt
|
|
|
endif
|
|
|
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
|
|
|
+ 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_IDN
|
|
|
- INCLUDES += -I$(LIBIDN_PATH)/include
|
|
|
- LDLIBS += $(LIBIDN_PATH)/lib/libidn.$(LIBEXT)
|
|
|
+ INCLUDES += -I$(LIBIDN_PATH)/include
|
|
|
+ LDLIBS += $(LIBIDN_PATH)/lib/libidn.$(LIBEXT)
|
|
|
endif
|
|
|
ifdef WITH_NGHTTP2
|
|
|
- INCLUDES += -I$(NGHTTP2_PATH)/include
|
|
|
- LDLIBS += $(NGHTTP2_PATH)/lib/libnghttp2.$(LIBEXT)
|
|
|
+ INCLUDES += -I$(NGHTTP2_PATH)/include
|
|
|
+ LDLIBS += $(NGHTTP2_PATH)/lib/libnghttp2.$(LIBEXT)
|
|
|
endif
|
|
|
|
|
|
ifeq ($(LIBARCH),LIBC)
|
|
|
- INCLUDES += -I$(NDK_LIBC)/include
|
|
|
- # INCLUDES += -I$(NDK_LIBC)/include/nks
|
|
|
- # INCLUDES += -I$(NDK_LIBC)/include/winsock
|
|
|
- CFLAGS += -D_POSIX_SOURCE
|
|
|
+ INCLUDES += -I$(NDK_LIBC)/include
|
|
|
+ # INCLUDES += -I$(NDK_LIBC)/include/nks
|
|
|
+ # INCLUDES += -I$(NDK_LIBC)/include/winsock
|
|
|
+ CFLAGS += -D_POSIX_SOURCE
|
|
|
else
|
|
|
- INCLUDES += -I$(NDK_CLIB)/include/nlm
|
|
|
- # INCLUDES += -I$(NDK_CLIB)/include/nlm/obsolete
|
|
|
- # INCLUDES += -I$(NDK_CLIB)/include
|
|
|
+ INCLUDES += -I$(NDK_CLIB)/include/nlm
|
|
|
+ # INCLUDES += -I$(NDK_CLIB)/include/nlm/obsolete
|
|
|
+ # INCLUDES += -I$(NDK_CLIB)/include
|
|
|
endif
|
|
|
ifndef DISABLE_LDAP
|
|
|
- INCLUDES += -I$(NDK_LDAP)/$(LIBARCH_L)/inc
|
|
|
+ INCLUDES += -I$(NDK_LDAP)/$(LIBARCH_L)/inc
|
|
|
endif
|
|
|
-CFLAGS += $(INCLUDES)
|
|
|
+CFLAGS += $(INCLUDES)
|
|
|
|
|
|
ifeq ($(MTSAFE),YES)
|
|
|
- XDCOPT = -n
|
|
|
+ XDCOPT = -n
|
|
|
endif
|
|
|
ifeq ($(MTSAFE),NO)
|
|
|
- XDCOPT = -u
|
|
|
+ XDCOPT = -u
|
|
|
endif
|
|
|
ifdef XDCOPT
|
|
|
- XDCDATA = $(OBJDIR)/$(TARGET).xdc
|
|
|
+ XDCDATA = $(OBJDIR)/$(TARGET).xdc
|
|
|
endif
|
|
|
|
|
|
ifeq ($(findstring /sh,$(SHELL)),/sh)
|
|
|
-DL = '
|
|
|
-DS = /
|
|
|
-PCT = %
|
|
|
+DL = '
|
|
|
+DS = /
|
|
|
+PCT = %
|
|
|
#-include $(NDKBASE)/nlmconv/ncpfs.inc
|
|
|
else
|
|
|
-DS = \\
|
|
|
-PCT = %%
|
|
|
+DS = \\
|
|
|
+PCT = %%
|
|
|
endif
|
|
|
|
|
|
# Makefile.inc provides the CSOURCES and HHEADERS defines
|
|
|
include Makefile.inc
|
|
|
|
|
|
-OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(notdir $(CSOURCES)))) $(OBJDIR)/nwos.o
|
|
|
+OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(notdir $(CSOURCES)))) $(OBJDIR)/nwos.o
|
|
|
|
|
|
-OBJL = $(OBJS) $(OBJDIR)/nwlib.o $(LDLIBS)
|
|
|
+OBJL = $(OBJS) $(OBJDIR)/nwlib.o $(LDLIBS)
|
|
|
|
|
|
vpath %.c . vauth vtls
|
|
|
|
|
@@ -757,4 +757,3 @@ $(LIBCARES_PATH)/libcares.$(LIBEXT):
|
|
|
ca-bundle.crt: mk-ca-bundle.pl
|
|
|
@echo Creating $@
|
|
|
@-$(PERL) $< -b -n $@
|
|
|
-
|