Gisle Vanem's djgpp fixes

This commit is contained in:
Daniel Stenberg 2003-12-19 08:03:48 +00:00
parent 4223f602ed
commit 4ea14b25df
2 changed files with 133 additions and 104 deletions

View File

@ -15,25 +15,43 @@ MAKEFILE = Makefile.dj
# with djgpp/Watt-32. Set to 0 if you don't need https URLs # with djgpp/Watt-32. Set to 0 if you don't need https URLs
# (reduces curl.exe with approx 700 kB) # (reduces curl.exe with approx 700 kB)
# #
USE_SSL = 1 USE_SSL = 0
#
# Use zlib for contents encoding
#
USE_ZLIB = 0
#
# Use Watt-32 IPv6 stack (only IPv6 name resolution working at the moment)
#
USE_IPV6 = 1
default: all default: all
# #
# Root directory for Waterloo tcp/ip. WATT_ROOT should be set # Root directory for Waterloo tcp/ip etc. Change to suite.
# during Watt-32 install. # WATT_ROOT should be set during Watt-32 install.
# #
WATT32_ROOT = $(subst \,/,$(WATT_ROOT)) WATT32_ROOT = $(subst \,/,$(WATT_ROOT))
OPENSSL_ROOT = /net/openssl.098 OPENSSL_ROOT = /net/openssl.098
ZLIB_ROOT = $(DJDIR)/contrib/zlib ZLIB_ROOT = /djgpp/contrib/zlib.121
CC = gcc CC = gcc
YACC = bison -y YACC = bison -y
CFLAGS = -g -O2 -I. -I../include -Wall -DHAVE_CONFIG_H CFLAGS = -g -O2 -I. -I../include -Wall -DHAVE_CONFIG_H -DHAVE_SPNEGO
ifeq ($(USE_SSL),1) ifeq ($(USE_SSL),1)
CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H CFLAGS += -DUSE_SSLEAY
endif
ifeq ($(USE_ZLIB),1)
CFLAGS += -DUSE_ZLIB -I$(ZLIB_ROOT)
endif
ifeq ($(USE_IPV6),1)
CFLAGS += -DENABLE_IPV6
endif endif
# #
@ -43,7 +61,7 @@ endif
# another machine). We therefore use a special 'specs' file during # another machine). We therefore use a special 'specs' file during
# pre-processing. # pre-processing.
# #
MM_SPECS = $(TMPDIR)/specs MM_SPECS = ./specs.dj
depend: $(DEPEND_PREREQ) depend: $(DEPEND_PREREQ)
@echo Generating dependencies.. @echo Generating dependencies..

View File

@ -3,45 +3,56 @@
# Gisle Vanem <giva@bgnett.no> # Gisle Vanem <giva@bgnett.no>
# #
DEPEND_PREREQ = config.h DEPEND_PREREQ = config.h hugehelp.c
include ../packages/DOS/common.dj include ../packages/DOS/common.dj
ifeq ($(USE_SSL),1) ifeq ($(USE_SSL),1)
EX_LIBS = $(OPENSSL_ROOT)/lib/libssl.a $(OPENSSL_ROOT)/lib/libcrypt.a EX_LIBS += $(OPENSSL_ROOT)/lib/libssl.a $(OPENSSL_ROOT)/lib/libcrypt.a
endif endif
EX_LIBS += $(WATT32_ROOT)/lib/libwatt.a $(ZLIB_ROOT)/libz.a ifeq ($(USE_ZLIB),1)
EX_LIBS += $(ZLIB_ROOT)/libz.a
endif
BIN = ../curl.exe EX_LIBS += $(WATT32_ROOT)/lib/libwatt.a
SOURCES = hugehelp.c main.c urlglob.c writeenv.c writeout.c
PROGRAM = ../curl.exe
SOURCES = getpass.c homedir.c hugehelp.c main.c urlglob.c writeenv.c writeout.c
OBJECTS = $(SOURCES:.c=.o) OBJECTS = $(SOURCES:.c=.o)
all: config.h $(BIN) all: config.h $(PROGRAM)
$(BIN): $(OBJECTS) ../lib/libcurl.a $(PROGRAM): $(OBJECTS) ../lib/libcurl.a
$(CC) -o $@ $^ $(EX_LIBS) $(CC) -o $@ $^ $(EX_LIBS)
config.h: config.h:
@echo '#include "../lib/config.dj"' > $@ @echo '#include "../lib/config.dj"' > $@
hugehelp.c: ../docs/curl.1 #
groff -man $^ | perl mkhelp.pl ../readme > $@ # groff 1.18+ requires "-P -c"
#
hugehelp.c: ../docs/MANUAL ../docs/curl.1 mkhelp.pl
groff -Tascii -man ../docs/curl.1 | \
perl -w mkhelp.pl ../docs/MANUAL ../readme > $@
clean: clean:
- rm -f $(OBJECTS) Makefile.bak config.h - rm -f $(OBJECTS) Makefile.bak config.h
vclean: clean realclean vclean: clean
- rm -f $(BIN) hugehelp.c - rm -f $(PROGRAM) hugehelp.c
# DO NOT DELETE THIS LINE # DO NOT DELETE THIS LINE
getpass.o: getpass.c setup.h config.h ../lib/config.dj
homedir.o: homedir.c setup.h config.h ../lib/config.dj
hugehelp.o: hugehelp.c hugehelp.o: hugehelp.c
main.o: main.c setup.h config.h ../lib/config.dj ../include/curl/curl.h \ main.o: main.c setup.h config.h ../lib/config.dj ../include/curl/curl.h \
../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \ ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
../include/curl/mprintf.h urlglob.h writeout.h version.h ../include/curl/mprintf.h urlglob.h writeout.h getpass.h homedir.h \
version.h
urlglob.o: urlglob.c setup.h config.h ../lib/config.dj \ urlglob.o: urlglob.c setup.h config.h ../lib/config.dj \
../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \ ../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \
../include/curl/multi.h urlglob.h ../include/curl/multi.h ../include/curl/mprintf.h urlglob.h
writeenv.o: writeenv.c setup.h config.h ../lib/config.dj writeenv.o: writeenv.c setup.h config.h ../lib/config.dj
writeout.o: writeout.c setup.h config.h ../lib/config.dj \ writeout.o: writeout.c setup.h config.h ../lib/config.dj \
../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \ ../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \