Gisle Vanem's djgpp fixes

diff --git a/packages/DOS/common.dj b/packages/DOS/common.dj
index 32208f6..4cf95c7 100644 (file)
--- a/packages/DOS/common.dj
+++ b/packages/DOS/common.dj
@@ -1,56 +1,74 @@
-#\r
-# Common defines for curl (djgpp/Watt-32)\r
-#\r
-# Assumes you've unpacked cURL with short-file names\r
-# I.e use "set LFN=n" before untaring on Win9x/XP.\r
-# Requires sed, yacc, rm and the usual stuff.\r
-#\r
-\r
-.SUFFIXES: .exe .y\r
-\r
-MAKEFILE = Makefile.dj\r
-\r
-#\r
-# OpenSSL is available from www.openssl.org and builds okay\r
-# with djgpp/Watt-32. Set to 0 if you don't need https URLs\r
-# (reduces curl.exe with approx 700 kB)\r
-#\r
-USE_SSL = 1\r
-\r
-default: all\r
-\r
-#\r
-# Root directory for Waterloo tcp/ip. WATT_ROOT should be set\r
-# during Watt-32 install.\r
-#\r
-WATT32_ROOT  = $(subst \,/,$(WATT_ROOT))\r
-OPENSSL_ROOT = /net/openssl.098\r
-ZLIB_ROOT    = $(DJDIR)/contrib/zlib\r
-\r
-CC   = gcc\r
-YACC = bison -y\r
-\r
-CFLAGS = -g -O2 -I. -I../include -Wall -DHAVE_CONFIG_H\r
-\r
-ifeq ($(USE_SSL),1)\r
-  CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H\r
-endif\r
-\r
-#\r
-# Generated dependencies; Due to some hacks in gcc 2.95+ and djgpp 2.03\r
-# we must prevent "$(DJDIR)/bin/../include/sys/version.h" from beeing\r
-# included in dependency output (or else this makefile cannot be used on\r
-# another machine). We therefore use a special 'specs' file during\r
-# pre-processing.\r
-#\r
-MM_SPECS = $(TMPDIR)/specs\r
-\r
-depend: $(DEPEND_PREREQ)\r
-       @echo Generating dependencies..\r
-       @copy $(MAKEFILE) Makefile.bak\r
-       @echo "*cpp: %(cpp_cpu) %{posix:-D_POSIX_SOURCE} -remap" > $(MM_SPECS)\r
-       sed -e "/^# DO NOT DELETE THIS LINE/,$$d" < Makefile.bak > $(MAKEFILE)\r
-       echo "# DO NOT DELETE THIS LINE"                        >> $(MAKEFILE)\r
-       $(CC) -MM -specs=$(MM_SPECS) $(CFLAGS) $(SOURCES)       >> $(MAKEFILE)\r
-       rm -f $(MM_SPECS)\r
-\r
+#
+# Common defines for curl (djgpp/Watt-32)
+#
+# Assumes you've unpacked cURL with short-file names
+# I.e use "set LFN=n" before untaring on Win9x/XP.
+# Requires sed, yacc, rm and the usual stuff.
+#
+
+.SUFFIXES: .exe .y
+
+MAKEFILE = Makefile.dj
+
+#
+# OpenSSL is available from www.openssl.org and builds okay
+# with djgpp/Watt-32. Set to 0 if you don't need https URLs
+# (reduces curl.exe with approx 700 kB)
+#
+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
+
+#
+# Root directory for Waterloo tcp/ip etc. Change to suite.
+# WATT_ROOT should be set during Watt-32 install.
+#
+WATT32_ROOT  = $(subst \,/,$(WATT_ROOT))
+OPENSSL_ROOT = /net/openssl.098
+ZLIB_ROOT    = /djgpp/contrib/zlib.121
+
+CC   = gcc
+YACC = bison -y
+
+CFLAGS = -g -O2 -I. -I../include -Wall -DHAVE_CONFIG_H -DHAVE_SPNEGO
+
+ifeq ($(USE_SSL),1)
+  CFLAGS += -DUSE_SSLEAY
+endif
+
+ifeq ($(USE_ZLIB),1)
+  CFLAGS += -DUSE_ZLIB -I$(ZLIB_ROOT)
+endif
+
+ifeq ($(USE_IPV6),1)
+  CFLAGS += -DENABLE_IPV6
+endif
+
+#
+# Generated dependencies; Due to some hacks in gcc 2.95+ and djgpp 2.03
+# we must prevent "$(DJDIR)/bin/../include/sys/version.h" from beeing
+# included in dependency output (or else this makefile cannot be used on
+# another machine). We therefore use a special 'specs' file during
+# pre-processing.
+#
+MM_SPECS = ./specs.dj
+
+depend: $(DEPEND_PREREQ)
+       @echo Generating dependencies..
+       @copy $(MAKEFILE) Makefile.bak
+       @echo "*cpp: %(cpp_cpu) %{posix:-D_POSIX_SOURCE} -remap" > $(MM_SPECS)
+       sed -e "/^# DO NOT DELETE THIS LINE/,$$d" < Makefile.bak > $(MAKEFILE)
+       echo "# DO NOT DELETE THIS LINE"                        >> $(MAKEFILE)
+       $(CC) -MM -specs=$(MM_SPECS) $(CFLAGS) $(SOURCES)       >> $(MAKEFILE)
+       rm -f $(MM_SPECS)
+

diff --git a/src/makefile.dj b/src/makefile.dj
index e84ba02..5e2102a 100644 (file)
--- a/src/makefile.dj
+++ b/src/makefile.dj
@@ -1,48 +1,59 @@
-#\r
-#  Adapted for djgpp2 / Watt-32 / DOS by\r
-#  Gisle Vanem <giva@bgnett.no>\r
-#\r
-\r
-DEPEND_PREREQ = config.h\r
-\r
-include ../packages/DOS/common.dj\r
-\r
-ifeq ($(USE_SSL),1)\r
-  EX_LIBS = $(OPENSSL_ROOT)/lib/libssl.a $(OPENSSL_ROOT)/lib/libcrypt.a\r
-endif\r
-\r
-EX_LIBS += $(WATT32_ROOT)/lib/libwatt.a $(ZLIB_ROOT)/libz.a\r
-\r
-BIN     = ../curl.exe\r
-SOURCES = hugehelp.c main.c urlglob.c writeenv.c writeout.c\r
-OBJECTS = $(SOURCES:.c=.o)\r
-\r
-all: config.h $(BIN)\r
-\r
-$(BIN): $(OBJECTS) ../lib/libcurl.a\r
-       $(CC) -o $@ $^ $(EX_LIBS)\r
-\r
-config.h:\r
-       @echo '#include "../lib/config.dj"' > $@\r
-\r
-hugehelp.c: ../docs/curl.1\r
-       groff -man $^ | perl mkhelp.pl ../readme > $@\r
-\r
-clean:\r
-       - rm -f $(OBJECTS) Makefile.bak config.h\r
-\r
-vclean: clean\r
-       - rm -f $(BIN) hugehelp.c\r
-\r
-# DO NOT DELETE THIS LINE\r
-hugehelp.o: hugehelp.c\r
-main.o: main.c setup.h config.h ../lib/config.dj ../include/curl/curl.h \\r
-  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \\r
-  ../include/curl/mprintf.h urlglob.h writeout.h version.h\r
-urlglob.o: urlglob.c setup.h config.h ../lib/config.dj \\r
-  ../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \\r
-  ../include/curl/multi.h urlglob.h\r
-writeenv.o: writeenv.c setup.h config.h ../lib/config.dj\r
-writeout.o: writeout.c setup.h config.h ../lib/config.dj \\r
-  ../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \\r
-  ../include/curl/multi.h ../include/curl/mprintf.h writeout.h\r
+#
+#  Adapted for djgpp2 / Watt-32 / DOS by
+#  Gisle Vanem <giva@bgnett.no>
+#
+
+DEPEND_PREREQ = config.h hugehelp.c
+
+include ../packages/DOS/common.dj
+
+ifeq ($(USE_SSL),1)
+  EX_LIBS += $(OPENSSL_ROOT)/lib/libssl.a $(OPENSSL_ROOT)/lib/libcrypt.a
+endif
+
+ifeq ($(USE_ZLIB),1)
+  EX_LIBS += $(ZLIB_ROOT)/libz.a
+endif
+
+EX_LIBS += $(WATT32_ROOT)/lib/libwatt.a
+
+PROGRAM = ../curl.exe
+SOURCES = getpass.c homedir.c hugehelp.c main.c urlglob.c writeenv.c writeout.c
+OBJECTS = $(SOURCES:.c=.o)
+
+all: config.h $(PROGRAM)
+
+$(PROGRAM): $(OBJECTS) ../lib/libcurl.a
+       $(CC) -o $@ $^ $(EX_LIBS)
+
+config.h:
+       @echo '#include "../lib/config.dj"' > $@
+
+#
+# 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:
+       - rm -f $(OBJECTS) Makefile.bak config.h
+
+realclean vclean: clean
+       - rm -f $(PROGRAM) hugehelp.c
+
+# 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
+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/mprintf.h urlglob.h writeout.h getpass.h homedir.h \
+  version.h
+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/multi.h ../include/curl/mprintf.h urlglob.h
+writeenv.o: writeenv.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/multi.h ../include/curl/mprintf.h writeout.h