moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

fixed build to use compiler-default lib extension.

Browse Source
This commit is contained in:
Gunter Knauf 2007-03-26 01:50:44 +00:00
parent a6f4612154
commit 8851df41c5
3 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ares/Makefile.netware
View File

@ -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 ## 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. # Edit the vars below to change NLM target settings.
TARGETS = adig.nlm ahost.nlm TARGETS = adig.nlm ahost.nlm
LTARGET = libcares.lib LTARGET = libcares.$(LIBEXT)
VERSION = $(LIBCARES_VERSION) VERSION = $(LIBCARES_VERSION)
COPYR = Copyright (C) 1996 - 2007, Daniel Stenberg, <daniel@haxx.se> COPYR = Copyright (C) 1996 - 2007, Daniel Stenberg, <daniel@haxx.se>
DESCR = cURL $(subst .def,,$(notdir $@)) $(LIBCARES_VERSION_STR) - http://curl.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 LDFLAGS = -nostdlib $(PRELUDE) $(OBJS) $(<:.def=.o) -o $@ -commandfile
AR = mwldnlm AR = mwldnlm
ARFLAGS = -type library -w nocmdline $(OBJDIR)/*.o -o ARFLAGS = -type library -w nocmdline $(OBJDIR)/*.o -o
LIBEXT = lib
CFLAGS += -msgstyle gcc -gccinc -inline off -opt nointrinsics -proc 586 CFLAGS += -msgstyle gcc -gccinc -inline off -opt nointrinsics -proc 586
CFLAGS += -relax_pointers CFLAGS += -relax_pointers
#CFLAGS += -w on #CFLAGS += -w on
@ -88,6 +89,7 @@ LD = nlmconv
LDFLAGS = -T LDFLAGS = -T
AR = ar AR = ar
ARFLAGS = -cq ARFLAGS = -cq
LIBEXT = a
CFLAGS += -fno-builtin -fpcc-struct-return -fno-strict-aliasing CFLAGS += -fno-builtin -fpcc-struct-return -fno-strict-aliasing
CFLAGS += -Wall -Wno-format -Wno-uninitialized # -pedantic CFLAGS += -Wall -Wno-format -Wno-uninitialized # -pedantic
ifeq ($(LIBARCH),LIBC) ifeq ($(LIBARCH),LIBC)
@ -155,7 +157,7 @@ clean:
-$(RM) -r $(OBJDIR) -$(RM) -r $(OBJDIR)
-$(RM) -r arpa -$(RM) -r arpa
%.lib: $(OBJS) %.$(LIBEXT): $(OBJS)
@echo Creating $@ @echo Creating $@
@-$(RM) $@ @-$(RM) $@
@$(AR) $(ARFLAGS) $@ $^ @$(AR) $(ARFLAGS) $@ $^

22
lib/Makefile.netware
View File

@ -19,7 +19,7 @@ endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8d OPENSSL_PATH = ../../openssl-0.9.8e
endif endif
# Edit the path below to point to the base of your LibSSH2 package. # 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) ifeq ($(CC),mwccnlm)
LD = mwldnlm LD = mwldnlm
LDFLAGS = -nostdlib $(PRELUDE) $(OBJL) -o $(TARGET).nlm -commandfile LDFLAGS = -nostdlib $(PRELUDE) $(OBJL) -o $@ -commandfile
AR = mwldnlm AR = mwldnlm
ARFLAGS = -type library -w nocmdline $(OBJS) -o ARFLAGS = -type library -w nocmdline $(OBJS) -o
LIBEXT = lib
CFLAGS += -msgstyle gcc -gccinc -inline off -opt nointrinsics -proc 586 CFLAGS += -msgstyle gcc -gccinc -inline off -opt nointrinsics -proc 586
CFLAGS += -relax_pointers CFLAGS += -relax_pointers
#CFLAGS += -w on #CFLAGS += -w on
@ -101,6 +102,7 @@ LD = nlmconv
LDFLAGS = -T LDFLAGS = -T
AR = ar AR = ar
ARFLAGS = -cq ARFLAGS = -cq
LIBEXT = a
CFLAGS += -fno-builtin -fpcc-struct-return -fno-strict-aliasing CFLAGS += -fno-builtin -fpcc-struct-return -fno-strict-aliasing
CFLAGS += -Wall # -pedantic CFLAGS += -Wall # -pedantic
ifeq ($(LIBARCH),LIBC) ifeq ($(LIBARCH),LIBC)
@ -120,17 +122,17 @@ INCLUDES = -I. -I../include
ifdef WITH_ARES ifdef WITH_ARES
INCLUDES += -I../ares INCLUDES += -I../ares
LDLIBS = ../ares/libcares.lib LDLIBS = ../ares/libcares.$(LIBEXT)
endif endif
ifdef WITH_SSL ifdef WITH_SSL
INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_libc -I$(OPENSSL_PATH)/outinc_nw_libc/openssl 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 IMPORTS += GetProcessSwitchCount RunningProcess
endif endif
ifdef WITH_SSH2 ifdef WITH_SSH2
INCLUDES += -I$(LIBSSH2_PATH)/include INCLUDES += -I$(LIBSSH2_PATH)/include
ifdef LINK_STATIC ifdef LINK_STATIC
LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.lib LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT)
else else
IMPORTS += @$(LIBSSH2_PATH)/nw/libssh2.imp IMPORTS += @$(LIBSSH2_PATH)/nw/libssh2.imp
MODULES += libssh2.nlm MODULES += libssh2.nlm
@ -139,7 +141,7 @@ 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.lib LDLIBS += $(ZLIB_PATH)/nw/libz.$(LIBEXT)
else else
IMPORTS += @$(ZLIB_PATH)/nw/libz.imp IMPORTS += @$(ZLIB_PATH)/nw/libz.imp
MODULES += libz.nlm MODULES += libz.nlm
@ -189,7 +191,7 @@ all: lib nlm
nlm: prebuild $(TARGET).nlm nlm: prebuild $(TARGET).nlm
lib: prebuild $(TARGET).lib lib: prebuild $(TARGET).$(LIBEXT)
prebuild: $(OBJDIR) $(OBJDIR)/version.inc config.h ca-bundle.h prebuild: $(OBJDIR) $(OBJDIR)/version.inc config.h ca-bundle.h
@ -207,7 +209,7 @@ dist: all
install: $(INSTDIR) all install: $(INSTDIR) all
@$(CP) $(TARGET).nlm $(INSTDIR) @$(CP) $(TARGET).nlm $(INSTDIR)
@$(CP) $(TARGET).lib $(INSTDIR) @$(CP) $(TARGET).$(LIBEXT) $(INSTDIR)
@$(CP) ../CHANGES $(INSTDIR) @$(CP) ../CHANGES $(INSTDIR)
@$(CP) ../COPYING $(INSTDIR) @$(CP) ../COPYING $(INSTDIR)
@$(CP) ../README $(INSTDIR) @$(CP) ../README $(INSTDIR)
@ -221,7 +223,7 @@ clean:
-$(RM) -r $(OBJDIR) -$(RM) -r $(OBJDIR)
distclean: clean distclean: clean
-$(RM) -r $(TARGET).lib $(TARGET).nlm -$(RM) -r $(TARGET).$(LIBEXT) $(TARGET).nlm
$(INSTDIR): $(INSTDIR):
@mkdir $(INSTDIR) @mkdir $(INSTDIR)
@ -229,7 +231,7 @@ $(INSTDIR):
$(OBJDIR): $(OBJDIR):
@mkdir $(OBJDIR) @mkdir $(OBJDIR)
$(TARGET).lib: $(OBJS) $(TARGET).$(LIBEXT): $(OBJS)
@echo Creating $@ @echo Creating $@
@-$(RM) $@ @-$(RM) $@
@$(AR) $(ARFLAGS) $@ $^ @$(AR) $(ARFLAGS) $@ $^

13
src/Makefile.netware
View File

@ -19,7 +19,7 @@ endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8d OPENSSL_PATH = ../../openssl-0.9.8e
endif endif
# Edit the path below to point to the base of your LibSSH2 package. # 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) ifeq ($(CC),mwccnlm)
LD = mwldnlm 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 += -gccinc -inline off -opt nointrinsics -proc 586
CFLAGS += -relax_pointers CFLAGS += -relax_pointers
#CFLAGS += -w on #CFLAGS += -w on
@ -96,6 +97,7 @@ endif
else else
LD = nlmconv LD = nlmconv
LDFLAGS = -T LDFLAGS = -T
LIBEXT = a
CFLAGS += -fno-builtin -fpcc-struct-return -fno-strict-aliasing CFLAGS += -fno-builtin -fpcc-struct-return -fno-strict-aliasing
CFLAGS += -Wall # -pedantic CFLAGS += -Wall # -pedantic
ifeq ($(LIBARCH),LIBC) ifeq ($(LIBARCH),LIBC)
@ -116,7 +118,7 @@ CURL_LIB = ../lib
INCLUDES = -I$(CURL_INC) -I$(CURL_LIB) INCLUDES = -I$(CURL_INC) -I$(CURL_LIB)
ifdef LINK_STATIC ifdef LINK_STATIC
LDLIBS = ../lib/libcurl.lib LDLIBS = ../lib/libcurl.$(LIBEXT)
IMPORTS = GetProcessSwitchCount RunningProcess IMPORTS = GetProcessSwitchCount RunningProcess
else else
MODULES = libcurl.nlm MODULES = libcurl.nlm
@ -125,7 +127,7 @@ 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.lib LDLIBS += $(ZLIB_PATH)/nw/libz.$(LIBEXT)
else else
IMPORTS += @$(ZLIB_PATH)/nw/libz.imp IMPORTS += @$(ZLIB_PATH)/nw/libz.imp
MODULES += libz.nlm MODULES += libz.nlm
@ -285,6 +287,9 @@ ifeq ($(LD),nlmconv)
@echo $(DL)input $(OBJS)$(DL) >> $@ @echo $(DL)input $(OBJS)$(DL) >> $@
@echo $(DL)input $(OBJX)$(DL) >> $@ @echo $(DL)input $(OBJX)$(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