aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ares/Makefile.netware10
-rw-r--r--lib/Makefile.netware22
-rw-r--r--src/Makefile.netware13
3 files changed, 27 insertions, 18 deletions
diff --git a/ares/Makefile.netware b/ares/Makefile.netware
index 874f5bf94..b2876af90 100644
--- a/ares/Makefile.netware
+++ b/ares/Makefile.netware
@@ -1,9 +1,9 @@
#################################################################
#
-## Makefile for building libares.lib (NetWare version - gnu make)
+## Makefile for building libares (NetWare version - gnu make)
## Use: make -f Makefile.netware
##
-## Comments to: Guenter Knauf <eflash@gmx.net>
+## Comments to: Guenter Knauf http://www.gknw.de/phpbb
#
#################################################################
@@ -18,7 +18,7 @@ endif
# Edit the vars below to change NLM target settings.
TARGETS = adig.nlm ahost.nlm
-LTARGET = libcares.lib
+LTARGET = libcares.$(LIBEXT)
VERSION = $(LIBCARES_VERSION)
COPYR = Copyright (C) 1996 - 2007, Daniel Stenberg, <daniel@haxx.se>
DESCR = cURL $(subst .def,,$(notdir $@)) $(LIBCARES_VERSION_STR) - http://curl.haxx.se
@@ -72,6 +72,7 @@ LD = mwldnlm
LDFLAGS = -nostdlib $(PRELUDE) $(OBJS) $(<:.def=.o) -o $@ -commandfile
AR = mwldnlm
ARFLAGS = -type library -w nocmdline $(OBJDIR)/*.o -o
+LIBEXT = lib
CFLAGS += -msgstyle gcc -gccinc -inline off -opt nointrinsics -proc 586
CFLAGS += -relax_pointers
#CFLAGS += -w on
@@ -88,6 +89,7 @@ LD = nlmconv
LDFLAGS = -T
AR = ar
ARFLAGS = -cq
+LIBEXT = a
CFLAGS += -fno-builtin -fpcc-struct-return -fno-strict-aliasing
CFLAGS += -Wall -Wno-format -Wno-uninitialized # -pedantic
ifeq ($(LIBARCH),LIBC)
@@ -155,7 +157,7 @@ clean:
-$(RM) -r $(OBJDIR)
-$(RM) -r arpa
-%.lib: $(OBJS)
+%.$(LIBEXT): $(OBJS)
@echo Creating $@
@-$(RM) $@
@$(AR) $(ARFLAGS) $@ $^
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 94123af5a..5f2922fa7 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -19,7 +19,7 @@ endif
# Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8d
+OPENSSL_PATH = ../../openssl-0.9.8e
endif
# Edit the path below to point to the base of your LibSSH2 package.
@@ -82,9 +82,10 @@ CFLAGS = $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc
ifeq ($(CC),mwccnlm)
LD = mwldnlm
-LDFLAGS = -nostdlib $(PRELUDE) $(OBJL) -o $(TARGET).nlm -commandfile
+LDFLAGS = -nostdlib $(PRELUDE) $(OBJL) -o $@ -commandfile
AR = mwldnlm
ARFLAGS = -type library -w nocmdline $(OBJS) -o
+LIBEXT = lib
CFLAGS += -msgstyle gcc -gccinc -inline off -opt nointrinsics -proc 586
CFLAGS += -relax_pointers
#CFLAGS += -w on
@@ -101,6 +102,7 @@ LD = nlmconv
LDFLAGS = -T
AR = ar
ARFLAGS = -cq
+LIBEXT = a
CFLAGS += -fno-builtin -fpcc-struct-return -fno-strict-aliasing
CFLAGS += -Wall # -pedantic
ifeq ($(LIBARCH),LIBC)
@@ -120,17 +122,17 @@ INCLUDES = -I. -I../include
ifdef WITH_ARES
INCLUDES += -I../ares
- LDLIBS = ../ares/libcares.lib
+ LDLIBS = ../ares/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.lib $(OPENSSL_PATH)/out_nw_libc/ssl.lib
+ 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.lib
+ LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT)
else
IMPORTS += @$(LIBSSH2_PATH)/nw/libssh2.imp
MODULES += libssh2.nlm
@@ -139,7 +141,7 @@ endif
ifdef WITH_ZLIB
INCLUDES += -I$(ZLIB_PATH)
ifdef LINK_STATIC
- LDLIBS += $(ZLIB_PATH)/nw/libz.lib
+ LDLIBS += $(ZLIB_PATH)/nw/libz.$(LIBEXT)
else
IMPORTS += @$(ZLIB_PATH)/nw/libz.imp
MODULES += libz.nlm
@@ -189,7 +191,7 @@ all: lib nlm
nlm: prebuild $(TARGET).nlm
-lib: prebuild $(TARGET).lib
+lib: prebuild $(TARGET).$(LIBEXT)
prebuild: $(OBJDIR) $(OBJDIR)/version.inc config.h ca-bundle.h
@@ -207,7 +209,7 @@ dist: all
install: $(INSTDIR) all
@$(CP) $(TARGET).nlm $(INSTDIR)
- @$(CP) $(TARGET).lib $(INSTDIR)
+ @$(CP) $(TARGET).$(LIBEXT) $(INSTDIR)
@$(CP) ../CHANGES $(INSTDIR)
@$(CP) ../COPYING $(INSTDIR)
@$(CP) ../README $(INSTDIR)
@@ -221,7 +223,7 @@ clean:
-$(RM) -r $(OBJDIR)
distclean: clean
- -$(RM) -r $(TARGET).lib $(TARGET).nlm
+ -$(RM) -r $(TARGET).$(LIBEXT) $(TARGET).nlm
$(INSTDIR):
@mkdir $(INSTDIR)
@@ -229,7 +231,7 @@ $(INSTDIR):
$(OBJDIR):
@mkdir $(OBJDIR)
-$(TARGET).lib: $(OBJS)
+$(TARGET).$(LIBEXT): $(OBJS)
@echo Creating $@
@-$(RM) $@
@$(AR) $(ARFLAGS) $@ $^
diff --git a/src/Makefile.netware b/src/Makefile.netware
index 42bb639df..c324c2296 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -19,7 +19,7 @@ endif
# Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8d
+OPENSSL_PATH = ../../openssl-0.9.8e
endif
# Edit the path below to point to the base of your LibSSH2 package.
@@ -81,7 +81,8 @@ CFLAGS = $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc
ifeq ($(CC),mwccnlm)
LD = mwldnlm
-LDFLAGS = -nostdlib $(PRELUDE) $(LDLIBS) $(OBJS) $(OBJX) -o $(TARGET).nlm -commandfile
+LDFLAGS = -nostdlib $(PRELUDE) $(LDLIBS) $(OBJS) $(OBJX) -o $@ -commandfile
+LIBEXT = lib
CFLAGS += -gccinc -inline off -opt nointrinsics -proc 586
CFLAGS += -relax_pointers
#CFLAGS += -w on
@@ -96,6 +97,7 @@ endif
else
LD = nlmconv
LDFLAGS = -T
+LIBEXT = a
CFLAGS += -fno-builtin -fpcc-struct-return -fno-strict-aliasing
CFLAGS += -Wall # -pedantic
ifeq ($(LIBARCH),LIBC)
@@ -116,7 +118,7 @@ CURL_LIB = ../lib
INCLUDES = -I$(CURL_INC) -I$(CURL_LIB)
ifdef LINK_STATIC
- LDLIBS = ../lib/libcurl.lib
+ LDLIBS = ../lib/libcurl.$(LIBEXT)
IMPORTS = GetProcessSwitchCount RunningProcess
else
MODULES = libcurl.nlm
@@ -125,7 +127,7 @@ endif
ifdef WITH_ZLIB
INCLUDES += -I$(ZLIB_PATH)
ifdef LINK_STATIC
- LDLIBS += $(ZLIB_PATH)/nw/libz.lib
+ LDLIBS += $(ZLIB_PATH)/nw/libz.$(LIBEXT)
else
IMPORTS += @$(ZLIB_PATH)/nw/libz.imp
MODULES += libz.nlm
@@ -285,6 +287,9 @@ ifeq ($(LD),nlmconv)
@echo $(DL)input $(OBJS)$(DL) >> $@
@echo $(DL)input $(OBJX)$(DL) >> $@
@echo $(DL)input $(PRELUDE)$(DL) >> $@
+ifdef LDLIBS
+ @echo $(DL)input $(LDLIBS)$(DL) >> $@
+endif
@echo $(DL)output $(TARGET).nlm$(DL) >> $@
endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 04:24:41 +0000