moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-03-11 07:39:50 -04:00
Code Issues Releases Wiki Activity

changed link lib order to make nlmconv happy.

Browse Source
This commit is contained in:
Gunter Knauf 2007-03-26 17:01:35 +00:00
parent 5fbc93c3eb
commit 8272abef28
2 changed files with 49 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lib/Makefile.netware
View File

@ -118,36 +118,40 @@ NDK_ROOT = $(NDKBASE)/ndk
SDK_CLIB = $(NDK_ROOT)/nwsdk SDK_CLIB = $(NDK_ROOT)/nwsdk
SDK_LIBC = $(NDK_ROOT)/libc SDK_LIBC = $(NDK_ROOT)/libc
SDK_LDAP = $(NDK_ROOT)/cldapsdk/netware SDK_LDAP = $(NDK_ROOT)/cldapsdk/netware
CURL_INC = ../include
CURL_LIB = ../lib
ARES_LIB = ../ares
INCLUDES = -I. -I../include INCLUDES = -I$(CURL_INC) -I$(CURL_LIB)
ifdef WITH_ARES ifdef WITH_ARES
INCLUDES += -I../ares INCLUDES += -I$(ARES_LIB)
LDLIBS = ../ares/libcares.$(LIBEXT) LDLIBS = $(ARES_LIB)/libcares.$(LIBEXT)
endif
ifdef WITH_SSL
INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_libc -I$(OPENSSL_PATH)/outinc_nw_libc/openssl
LDLIBS += $(OPENSSL_PATH)/out_nw_libc/crypto.$(LIBEXT) $(OPENSSL_PATH)/out_nw_libc/ssl.$(LIBEXT)
IMPORTS += GetProcessSwitchCount RunningProcess
endif
ifdef WITH_SSH2
INCLUDES += -I$(LIBSSH2_PATH)/include
ifdef LINK_STATIC
LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT)
else
IMPORTS += @$(LIBSSH2_PATH)/nw/libssh2.imp
MODULES += libssh2.nlm
endif
endif endif
ifdef WITH_ZLIB ifdef WITH_ZLIB
INCLUDES += -I$(ZLIB_PATH) INCLUDES += -I$(ZLIB_PATH)
ifdef LINK_STATIC ifdef LINK_STATIC
LDLIBS += $(ZLIB_PATH)/nw/libz.$(LIBEXT) LDLIBS += $(ZLIB_PATH)/nw/libz.$(LIBEXT)
else else
IMPORTS += @$(ZLIB_PATH)/nw/libz.imp
MODULES += libz.nlm MODULES += libz.nlm
IMPORTS += @$(ZLIB_PATH)/nw/libz.imp
endif endif
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
INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_libc -I$(OPENSSL_PATH)/outinc_nw_libc/openssl
LDLIBS += $(OPENSSL_PATH)/out_nw_libc/ssl.$(LIBEXT)
LDLIBS += $(OPENSSL_PATH)/out_nw_libc/crypto.$(LIBEXT)
IMPORTS += GetProcessSwitchCount RunningProcess
endif
ifeq ($(LIBARCH),LIBC) ifeq ($(LIBARCH),LIBC)
INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks
@ -184,9 +188,9 @@ endif
# Makefile.inc provides the CSOURCES and HHEADERS defines # Makefile.inc provides the CSOURCES and HHEADERS defines
include Makefile.inc include Makefile.inc
OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CSOURCES))) $(LDLIBS) OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CSOURCES)))
OBJL = $(OBJS) $(OBJDIR)/nwlib.o OBJL = $(OBJS) $(OBJDIR)/nwlib.o $(LDLIBS)
all: lib nlm all: lib nlm
@ -306,11 +310,11 @@ ifdef IMPORTS
@echo $(DL)import $(IMPORTS)$(DL) >> $@ @echo $(DL)import $(IMPORTS)$(DL) >> $@
endif endif
ifeq ($(LD),nlmconv) ifeq ($(LD),nlmconv)
ifdef LDLIBS
@echo $(DL)input $(LDLIBS)$(DL) >> $@
endif
@echo $(DL)input $(OBJL)$(DL) >> $@ @echo $(DL)input $(OBJL)$(DL) >> $@
@echo $(DL)input $(PRELUDE)$(DL) >> $@ @echo $(DL)input $(PRELUDE)$(DL) >> $@
#ifdef LDLIBS
# @echo $(DL)input $(LDLIBS)$(DL) >> $@
#endif
@echo $(DL)output $(TARGET).nlm$(DL) >> $@ @echo $(DL)output $(TARGET).nlm$(DL) >> $@
endif endif
@ -478,6 +482,6 @@ else
endif endif
$(LIBCARES): $(LIBCARES):
$(MAKE) -C ../ares -f Makefile.netware lib $(MAKE) -C $(ARES_LIB) -f Makefile.netware lib

28
src/Makefile.netware
View File

@ -82,7 +82,7 @@ CFLAGS = $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc
ifeq ($(CC),mwccnlm) ifeq ($(CC),mwccnlm)
LD = mwldnlm LD = mwldnlm
LDFLAGS = -nostdlib $(PRELUDE) $(LDLIBS) $(OBJS) $(OBJX) -o $@ -commandfile LDFLAGS = -nostdlib $(OBJS) $(PRELUDE) $(LDLIBS) -o $@ -commandfile
LIBEXT = lib LIBEXT = lib
CFLAGS += -gccinc -inline off -opt nointrinsics -proc 586 CFLAGS += -gccinc -inline off -opt nointrinsics -proc 586
CFLAGS += -relax_pointers CFLAGS += -relax_pointers
@ -115,25 +115,39 @@ SDK_LIBC = $(NDK_ROOT)/libc
SDK_LDAP = $(NDK_ROOT)/cldapsdk/netware SDK_LDAP = $(NDK_ROOT)/cldapsdk/netware
CURL_INC = ../include CURL_INC = ../include
CURL_LIB = ../lib CURL_LIB = ../lib
ARES_LIB = ../ares
INCLUDES = -I$(CURL_INC) -I$(CURL_LIB) INCLUDES = -I$(CURL_INC) -I$(CURL_LIB)
ifdef LINK_STATIC ifdef LINK_STATIC
LDLIBS = ../lib/libcurl.$(LIBEXT) LDLIBS = $(CURL_LIB)/libcurl.$(LIBEXT)
IMPORTS = GetProcessSwitchCount RunningProcess
else else
MODULES = libcurl.nlm MODULES = libcurl.nlm
IMPORTS = @../lib/libcurl.imp IMPORTS = @$(CURL_LIB)/libcurl.imp
endif endif
ifdef WITH_ZLIB ifdef WITH_ZLIB
INCLUDES += -I$(ZLIB_PATH) INCLUDES += -I$(ZLIB_PATH)
ifdef LINK_STATIC ifdef LINK_STATIC
LDLIBS += $(ZLIB_PATH)/nw/libz.$(LIBEXT) LDLIBS += $(ZLIB_PATH)/nw/libz.$(LIBEXT)
else else
IMPORTS += @$(ZLIB_PATH)/nw/libz.imp
MODULES += libz.nlm MODULES += libz.nlm
IMPORTS += @$(ZLIB_PATH)/nw/libz.imp
endif endif
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) ifeq ($(LIBARCH),LIBC)
INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks
@ -169,10 +183,10 @@ endif
# Makefile.inc provides the CSOURCES and HHEADERS defines # Makefile.inc provides the CSOURCES and HHEADERS defines
include Makefile.inc include Makefile.inc
OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CURL_SOURCES)))
OBJX := $(patsubst %.c,$(OBJDIR)/%.o,$(notdir $(strip $(CURLX_ONES)))) 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 all: prebuild $(TARGET).nlm