Gisle's djgpp updates

4 files changed, 237 insertions, 188 deletions

diff --git a/lib/config.dj b/lib/config.dj
index 98154b147..479b070ba 100644
--- a/lib/config.dj
+++ b/lib/config.dj
@@ -25,6 +25,7 @@
 #define HAVE_IO_H              1
 #define HAVE_IOCTLSOCKET       1
 #define HAVE_INET_PTON         1
+#define HAVE_INET_NTOP         1
 #define HAVE_LONGLONG          1
 #define HAVE_MALLOC_H          1
 #define HAVE_MEMORY_H          1
@@ -89,7 +90,7 @@
   #define OPENSSL_NO_KRB5        1
 #endif
 
-/* Because djgpp < 2.03 doesn't have snprintf() etc.
+/* Because djgpp <= 2.03 doesn't have snprintf() etc.
  */
 #if (DJGPP_MINOR < 4)
   #define _MPRINTF_REPLACE
diff --git a/lib/makefile.dj b/lib/makefile.dj
index d3b88b4fd..2cc13e275 100644
--- a/lib/makefile.dj
+++ b/lib/makefile.dj
@@ -7,31 +7,28 @@ DEPEND_PREREQ = config.h getdate.c
 
 include ../packages/DOS/common.dj
 
-ifeq ($(USE_SSL),1)
-  CFLAGS += -I$(OPENSSL_ROOT)
-endif
-
-SOURCES = base64.c   connect.c  content_.c cookie.c   dict.c     \
-          easy.c     escape.c   file.c     formdata.c ftp.c      \
-          getdate.c  getenv.c   getinfo.c  hash.c     hostip.c   \
-          if2ip.c    krb4.c     md5.c      ldap.c     llist.c    \
-          memdebug.c mprintf.c  multi.c    netrc.c    progress.c \
-          security.c sendf.c    share.c    speedche.c ssluse.c   \
-          strequal.c strtok.c   telnet.c   timeval.c  transfer.c \
-          strerror.c strtoofft.c url.c     version.c  http.c     \
-          http_chunks.c http_digest.c http_negotiate.c http_ntlm.c
+SOURCES = base64.c      connect.c     content_encoding.c cookie.c dict.c \
+          easy.c        escape.c      file.c     formdata.c ftp.c        \
+          getdate.c     getenv.c      getinfo.c  hash.c     hostip.c     \
+          hostip6.c     hostip4.c     hostares.c hostasyn.c hostsyn.c    \
+          if2ip.c       krb4.c        md5.c      ldap.c     llist.c      \
+          memdebug.c    mprintf.c     multi.c    netrc.c    progress.c   \
+          security.c    sendf.c       share.c    speedcheck.c ssluse.c   \
+          strequal.c    strtok.c      telnet.c   timeval.c  transfer.c   \
+          strerror.c    strtoofft.c   url.c      version.c  http.c       \
+          http_chunks.c http_digest.c http_negotiate.c      http_ntlm.c
 
 SOURCES := $(strip $(SOURCES))
-OBJECTS  = $(SOURCES:.c=.o)
+OBJECTS  = $(addprefix $(OBJ_DIR)/, $(SOURCES:.c=.o))
 CURL_LIB = libcurl.a
 
-all: config.h $(CURL_LIB)
+all: $(OBJ_DIR) config.h $(CURL_LIB)
 
 $(CURL_LIB): $(OBJECTS)
 	ar rs $@ $?
 
 config.h: config.dj
-	@echo '#include "./config.dj"' > $@
+	cp $^ $@
 
 getdate.c: getdate.y
 	$(YACC) -o $@ $^
@@ -44,158 +41,196 @@ realclean vclean: clean
 
 
 # DO NOT DELETE THIS LINE
-base64.o: base64.c setup.h config.h config.dj ../include/curl/mprintf.h \
-  base64.h
-connect.o: connect.c setup.h config.h config.dj urldata.h cookie.h \
-  ../include/curl/curl.h ../include/curl/curlver.h \
-  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
-  if2ip.h strerror.h connect.h
-content_.o: content_.c setup.h config.h config.dj
-cookie.o: cookie.c setup.h config.h config.dj urldata.h cookie.h \
-  ../include/curl/curl.h ../include/curl/curlver.h \
-  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h getdate.h \
-  strequal.h strtok.h sendf.h
-dict.o: dict.c setup.h config.h config.dj urldata.h cookie.h \
-  ../include/curl/curl.h ../include/curl/curlver.h \
-  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h transfer.h \
-  sendf.h progress.h strequal.h dict.h ../include/curl/mprintf.h
-easy.o: easy.c setup.h config.h config.dj strequal.h urldata.h cookie.h \
-  ../include/curl/curl.h ../include/curl/curlver.h \
-  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h transfer.h \
-  ssluse.h url.h getinfo.h share.h ../include/curl/mprintf.h
-escape.o: escape.c setup.h config.h config.dj ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/types.h \
-  ../include/curl/easy.h ../include/curl/multi.h
-file.o: file.c setup.h config.h config.dj urldata.h cookie.h \
-  ../include/curl/curl.h ../include/curl/curlver.h \
-  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h progress.h \
-  sendf.h escape.h file.h speedcheck.h getinfo.h transfer.h \
+djgpp/base64.o: base64.c setup.h config.h ../include/curl/mprintf.h base64.h \
+  memory.h ../include/curl/curl.h ../include/curl/curlver.h \
+  ../include/curl/easy.h ../include/curl/multi.h memdebug.h
+djgpp/connect.o: connect.c setup.h config.h urldata.h cookie.h \
+  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
+  hash.h llist.h sendf.h if2ip.h strerror.h connect.h memory.h memdebug.h
+djgpp/content_encoding.o: content_encoding.c setup.h config.h
+djgpp/cookie.o: cookie.c setup.h config.h urldata.h cookie.h \
+  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
+  hash.h llist.h getdate.h strequal.h strtok.h sendf.h memory.h \
+  memdebug.h
+djgpp/dict.o: dict.c setup.h config.h urldata.h cookie.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
+  hash.h llist.h transfer.h sendf.h progress.h strequal.h dict.h \
   ../include/curl/mprintf.h
-formdata.o: formdata.c setup.h config.h config.dj ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/types.h \
-  ../include/curl/easy.h ../include/curl/multi.h formdata.h strequal.h
-ftp.o: ftp.c setup.h config.h config.dj ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/types.h \
-  ../include/curl/easy.h ../include/curl/multi.h urldata.h cookie.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
-  if2ip.h progress.h transfer.h escape.h http.h ftp.h strtoofft.h \
-  strequal.h ssluse.h connect.h strerror.h ../include/curl/mprintf.h
-getdate.o: getdate.c setup.h config.h config.dj getdate.h
-getenv.o: getenv.c setup.h config.h config.dj ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/types.h \
-  ../include/curl/easy.h ../include/curl/multi.h
-getinfo.o: getinfo.c setup.h config.h config.dj ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/types.h \
-  ../include/curl/easy.h ../include/curl/multi.h urldata.h cookie.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h getinfo.h
-hash.o: hash.c setup.h config.h config.dj hash.h llist.h
-hostip.o: hostip.c setup.h config.h config.dj urldata.h cookie.h \
-  ../include/curl/curl.h ../include/curl/curlver.h \
-  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
-  share.h url.h ../include/curl/mprintf.h
-if2ip.o: if2ip.c setup.h config.h config.dj if2ip.h
-krb4.o: krb4.c setup.h config.h config.dj
-md5.o: md5.c setup.h config.h config.dj md5.h
-ldap.o: ldap.c setup.h config.h config.dj urldata.h cookie.h \
-  ../include/curl/curl.h ../include/curl/curlver.h \
-  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
-  escape.h transfer.h ldap.h ../include/curl/mprintf.h
-llist.o: llist.c setup.h config.h config.dj llist.h
-memdebug.o: memdebug.c
-mprintf.o: mprintf.c setup.h config.h config.dj ../include/curl/mprintf.h
-multi.o: multi.c setup.h config.h config.dj ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/types.h \
-  ../include/curl/easy.h ../include/curl/multi.h urldata.h cookie.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h transfer.h \
-  url.h connect.h progress.h
-netrc.o: netrc.c setup.h config.h config.dj ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/types.h \
-  ../include/curl/easy.h ../include/curl/multi.h netrc.h strequal.h \
-  strtok.h ../include/curl/mprintf.h
-progress.o: progress.c setup.h config.h config.dj ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/types.h \
-  ../include/curl/easy.h ../include/curl/multi.h urldata.h cookie.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
-  progress.h ../include/curl/mprintf.h
-security.o: security.c setup.h config.h config.dj
-sendf.o: sendf.c setup.h config.h config.dj ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/types.h \
-  ../include/curl/easy.h ../include/curl/multi.h urldata.h cookie.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
-  connect.h ../include/curl/mprintf.h
-share.o: share.c setup.h config.h config.dj ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/types.h \
-  ../include/curl/easy.h ../include/curl/multi.h urldata.h cookie.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h share.h
-speedche.o: speedche.c setup.h config.h config.dj ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/types.h \
-  ../include/curl/easy.h ../include/curl/multi.h urldata.h cookie.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
-  speedcheck.h
-ssluse.o: ssluse.c setup.h config.h config.dj urldata.h cookie.h \
-  ../include/curl/curl.h ../include/curl/curlver.h \
-  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
-  url.h inet_pton.h ssluse.h connect.h
-strequal.o: strequal.c setup.h config.h config.dj strequal.h
-strtok.o: strtok.c setup.h config.h config.dj strtok.h
-telnet.o: telnet.c setup.h config.h config.dj urldata.h cookie.h \
-  ../include/curl/curl.h ../include/curl/curlver.h \
-  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h transfer.h \
-  sendf.h telnet.h ../include/curl/mprintf.h arpa_telnet.h
-timeval.o: timeval.c timeval.h setup.h config.h config.dj
-transfer.o: transfer.c setup.h config.h config.dj strtoofft.h \
-  ../include/curl/curl.h ../include/curl/curlver.h \
-  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
-  strequal.h urldata.h cookie.h formdata.h timeval.h http_chunks.h \
-  hostip.h hash.h llist.h netrc.h content_encoding.h transfer.h sendf.h \
-  speedcheck.h progress.h getdate.h http.h url.h getinfo.h ssluse.h \
-  http_digest.h http_ntlm.h http_negotiate.h share.h \
+djgpp/easy.o: easy.c setup.h config.h strequal.h urldata.h cookie.h \
+  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
+  hash.h llist.h transfer.h ssluse.h url.h getinfo.h share.h memory.h \
+  ../include/curl/mprintf.h memdebug.h
+djgpp/escape.o: escape.c setup.h config.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h memory.h ../include/curl/mprintf.h memdebug.h
+djgpp/file.o: file.c setup.h config.h urldata.h cookie.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
+  hash.h llist.h progress.h sendf.h escape.h file.h speedcheck.h \
+  getinfo.h transfer.h url.h memory.h ../include/curl/mprintf.h \
+  memdebug.h
+djgpp/formdata.o: formdata.c setup.h config.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h strequal.h memory.h \
+  ../include/curl/mprintf.h memdebug.h
+djgpp/ftp.o: ftp.c setup.h config.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h urldata.h cookie.h formdata.h timeval.h \
+  http_chunks.h hostip.h hash.h llist.h sendf.h if2ip.h progress.h \
+  transfer.h escape.h http.h ftp.h strtoofft.h strequal.h ssluse.h \
+  connect.h strerror.h memory.h inet_ntop.h ../include/curl/mprintf.h \
+  memdebug.h
+djgpp/getdate.o: getdate.c setup.h config.h memory.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h memdebug.h getdate.h
+djgpp/getenv.o: getenv.c setup.h config.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h memory.h memdebug.h
+djgpp/getinfo.o: getinfo.c setup.h config.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h urldata.h cookie.h formdata.h timeval.h \
+  http_chunks.h hostip.h hash.h llist.h getinfo.h memory.h memdebug.h
+djgpp/hash.o: hash.c setup.h config.h hash.h llist.h memory.h \
+  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h memdebug.h
+djgpp/hostip.o: hostip.c setup.h config.h urldata.h cookie.h \
+  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
+  hash.h llist.h sendf.h share.h strerror.h url.h inet_ntop.h \
+  ../include/curl/mprintf.h memory.h memdebug.h
+djgpp/hostip6.o: hostip6.c setup.h config.h urldata.h cookie.h \
+  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
+  hash.h llist.h sendf.h share.h strerror.h url.h \
+  ../include/curl/mprintf.h memory.h memdebug.h
+djgpp/hostip4.o: hostip4.c setup.h config.h urldata.h cookie.h \
+  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
+  hash.h llist.h sendf.h share.h strerror.h url.h \
+  ../include/curl/mprintf.h memory.h memdebug.h
+djgpp/hostares.o: hostares.c setup.h config.h urldata.h cookie.h \
+  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
+  hash.h llist.h sendf.h share.h strerror.h url.h \
+  ../include/curl/mprintf.h memory.h memdebug.h
+djgpp/hostasyn.o: hostasyn.c setup.h config.h urldata.h cookie.h \
+  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
+  hash.h llist.h sendf.h share.h strerror.h url.h \
+  ../include/curl/mprintf.h memory.h memdebug.h
+djgpp/hostsyn.o: hostsyn.c setup.h config.h urldata.h cookie.h \
+  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
+  hash.h llist.h sendf.h share.h strerror.h url.h \
+  ../include/curl/mprintf.h memory.h memdebug.h
+djgpp/if2ip.o: if2ip.c setup.h config.h if2ip.h memory.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h memdebug.h
+djgpp/krb4.o: krb4.c setup.h config.h
+djgpp/md5.o: md5.c setup.h config.h md5.h
+djgpp/ldap.o: ldap.c setup.h config.h urldata.h cookie.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
+  hash.h llist.h sendf.h escape.h transfer.h strequal.h strtok.h ldap.h \
+  memory.h ../include/curl/mprintf.h memdebug.h
+djgpp/llist.o: llist.c setup.h config.h llist.h memory.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h memdebug.h
+djgpp/memdebug.o: memdebug.c setup.h config.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h ../include/curl/mprintf.h urldata.h cookie.h \
+  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h memory.h \
+  memdebug.h
+djgpp/mprintf.o: mprintf.c setup.h config.h ../include/curl/mprintf.h memory.h \
+  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h memdebug.h
+djgpp/multi.o: multi.c setup.h config.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h urldata.h cookie.h formdata.h timeval.h \
+  http_chunks.h hostip.h hash.h llist.h transfer.h url.h connect.h \
+  progress.h memory.h memdebug.h
+djgpp/netrc.o: netrc.c setup.h config.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h netrc.h strequal.h strtok.h memory.h \
+  ../include/curl/mprintf.h memdebug.h
+djgpp/progress.o: progress.c setup.h config.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h urldata.h cookie.h formdata.h timeval.h \
+  http_chunks.h hostip.h hash.h llist.h sendf.h progress.h \
   ../include/curl/mprintf.h
-strerror.o: strerror.c setup.h config.h config.dj ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/types.h \
-  ../include/curl/easy.h ../include/curl/multi.h strerror.h urldata.h \
-  cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h \
+djgpp/security.o: security.c setup.h config.h
+djgpp/sendf.o: sendf.c setup.h config.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h urldata.h cookie.h formdata.h timeval.h \
+  http_chunks.h hostip.h hash.h llist.h sendf.h connect.h \
+  ../include/curl/mprintf.h memory.h memdebug.h
+djgpp/share.o: share.c setup.h config.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h urldata.h cookie.h formdata.h timeval.h \
+  http_chunks.h hostip.h hash.h llist.h share.h memory.h memdebug.h
+djgpp/speedcheck.o: speedcheck.c setup.h config.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h urldata.h cookie.h formdata.h timeval.h \
+  http_chunks.h hostip.h hash.h llist.h sendf.h speedcheck.h
+djgpp/ssluse.o: ssluse.c setup.h config.h urldata.h cookie.h \
+  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
+  hash.h llist.h sendf.h url.h inet_pton.h ssluse.h connect.h strequal.h \
   ../include/curl/mprintf.h
-strtoofft.o: strtoofft.c setup.h config.h config.dj strtoofft.h \
-  ../include/curl/curl.h ../include/curl/curlver.h \
-  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h
-url.o: url.c setup.h config.h config.dj urldata.h cookie.h \
-  ../include/curl/curl.h ../include/curl/curlver.h \
-  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h netrc.h \
-  base64.h ssluse.h if2ip.h transfer.h sendf.h progress.h strequal.h \
-  escape.h strtok.h share.h content_encoding.h http_digest.h \
-  http_negotiate.h ftp.h dict.h telnet.h http.h file.h ldap.h url.h \
-  connect.h ca-bundle.h ../include/curl/mprintf.h
-version.o: version.c setup.h config.h config.dj ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/types.h \
-  ../include/curl/easy.h ../include/curl/multi.h urldata.h cookie.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h
-http.o: http.c setup.h config.h config.dj urldata.h cookie.h \
-  ../include/curl/curl.h ../include/curl/curlver.h \
-  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h transfer.h \
-  sendf.h progress.h base64.h strequal.h ssluse.h http_digest.h \
-  http_ntlm.h http_negotiate.h url.h share.h http.h \
+djgpp/strequal.o: strequal.c setup.h config.h strequal.h
+djgpp/strtok.o: strtok.c setup.h config.h strtok.h
+djgpp/telnet.o: telnet.c setup.h config.h urldata.h cookie.h \
+  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
+  hash.h llist.h transfer.h sendf.h telnet.h ../include/curl/mprintf.h \
+  arpa_telnet.h memory.h memdebug.h
+djgpp/timeval.o: timeval.c timeval.h setup.h config.h
+djgpp/transfer.o: transfer.c setup.h config.h strtoofft.h \
+  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h strequal.h urldata.h cookie.h formdata.h \
+  timeval.h http_chunks.h hostip.h hash.h llist.h netrc.h \
+  content_encoding.h transfer.h sendf.h speedcheck.h progress.h getdate.h \
+  http.h url.h getinfo.h ssluse.h http_digest.h http_ntlm.h \
+  http_negotiate.h share.h memory.h ../include/curl/mprintf.h memdebug.h
+djgpp/strerror.o: strerror.c setup.h config.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h strerror.h urldata.h cookie.h formdata.h \
+  timeval.h http_chunks.h hostip.h hash.h llist.h \
   ../include/curl/mprintf.h
-http_chunks.o: http_chunks.c setup.h config.h config.dj urldata.h \
-  cookie.h ../include/curl/curl.h ../include/curl/curlver.h \
-  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
-  content_encoding.h http.h ../include/curl/mprintf.h
-http_digest.o: http_digest.c setup.h config.h config.dj urldata.h \
-  cookie.h ../include/curl/curl.h ../include/curl/curlver.h \
-  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
-  formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h sendf.h \
-  strequal.h md5.h http_digest.h ../include/curl/mprintf.h
-http_negotiate.o: http_negotiate.c setup.h config.h config.dj
-http_ntlm.o: http_ntlm.c setup.h config.h config.dj
+djgpp/strtoofft.o: strtoofft.c setup.h config.h strtoofft.h \
+  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h
+djgpp/url.o: url.c setup.h config.h urldata.h cookie.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
+  hash.h llist.h netrc.h base64.h ssluse.h if2ip.h transfer.h sendf.h \
+  progress.h strequal.h escape.h strtok.h share.h content_encoding.h \
+  http_digest.h http_negotiate.h ftp.h dict.h telnet.h http.h file.h \
+  ldap.h url.h connect.h inet_ntop.h ca-bundle.h \
+  ../include/curl/mprintf.h memory.h memdebug.h
+djgpp/version.o: version.c setup.h config.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h urldata.h cookie.h formdata.h timeval.h \
+  http_chunks.h hostip.h hash.h llist.h ../include/curl/mprintf.h
+djgpp/http.o: http.c setup.h config.h urldata.h cookie.h ../include/curl/curl.h \
+  ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
+  hash.h llist.h transfer.h sendf.h progress.h base64.h strequal.h \
+  ssluse.h http_digest.h http_ntlm.h http_negotiate.h url.h share.h \
+  http.h memory.h ../include/curl/mprintf.h memdebug.h
+djgpp/http_chunks.o: http_chunks.c setup.h config.h urldata.h cookie.h \
+  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
+  hash.h llist.h sendf.h content_encoding.h http.h memory.h \
+  ../include/curl/mprintf.h memdebug.h
+djgpp/http_digest.o: http_digest.c setup.h config.h urldata.h cookie.h \
+  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
+  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
+  hash.h llist.h sendf.h strequal.h base64.h md5.h http_digest.h strtok.h \
+  url.h memory.h ../include/curl/mprintf.h memdebug.h
+djgpp/http_negotiate.o: http_negotiate.c setup.h config.h
+djgpp/http_ntlm.o: http_ntlm.c setup.h config.h
diff --git a/packages/DOS/common.dj b/packages/DOS/common.dj
index 2ca0cb58b..d294d3039 100644
--- a/packages/DOS/common.dj
+++ b/packages/DOS/common.dj
@@ -9,6 +9,7 @@
 .SUFFIXES: .exe .y
 
 MAKEFILE = Makefile.dj
+OBJ_DIR = djgpp
 
 #
 # OpenSSL is available from www.openssl.org and builds okay
@@ -48,7 +49,7 @@ YACC = bison -y
 CFLAGS = -g -O2 -I. -I../include -I../lib -Wall -DHAVE_CONFIG_H
 
 ifeq ($(USE_SSL),1)
-  CFLAGS += -DUSE_SSLEAY
+  CFLAGS += -DUSE_SSLEAY -I$(OPENSSL_ROOT)
 endif
 
 ifeq ($(USE_ZLIB),1)
@@ -63,6 +64,13 @@ ifeq ($(USE_DEBUG),1)
   CFLAGS += -DDEBUG=1 -DCURLDEBUG #-DMALLOCDEBUG=1 -DDPRINTF_DEBUG2=1
 endif
 
+$(OBJ_DIR):
+	mkdir $(OBJ_DIR)
+
+$(OBJ_DIR)/%.o: %.c
+	$(CC) $(CFLAGS) -o $@ -c $<
+	@echo
+
 #
 # 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
@@ -78,6 +86,7 @@ depend: $(DEPEND_PREREQ)
 	@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)
+	$(CC) -MM -specs=$(MM_SPECS) $(CFLAGS) $(SOURCES) | \
+	  sed -e 's/^\([a-zA-Z0-9_-]*\.o:\)/'$(OBJ_DIR)'\/\1/'  >> $(MAKEFILE)
 	rm -f $(MM_SPECS)
 
diff --git a/src/makefile.dj b/src/makefile.dj
index 5517d87f1..de2e8fbc6 100644
--- a/src/makefile.dj
+++ b/src/makefile.dj
@@ -21,9 +21,9 @@ CFLAGS += -DUSE_MANUAL -DUSE_ENVIRONMENT
 
 PROGRAM = ../curl.exe
 SOURCES = getpass.c homedir.c hugehelp.c main.c urlglob.c writeenv.c writeout.c
-OBJECTS = $(SOURCES:.c=.o)
+OBJECTS = $(addprefix $(OBJ_DIR)/, $(SOURCES:.c=.o))
 
-all: config.h $(PROGRAM)
+all: $(OBJ_DIR) config.h $(PROGRAM)
 
 $(PROGRAM): $(OBJECTS) ../lib/libcurl.a
 	$(CC) -o $@ $^ $(EX_LIBS)
@@ -45,23 +45,27 @@ realclean vclean: clean
 	- rm -f $(PROGRAM) hugehelp.c
 
 # DO NOT DELETE THIS LINE
-getpass.o: getpass.c setup.h config.h ../lib/config.dj ../lib/setup.h \
-  ../lib/config.h getpass.h ../lib/memdebug.h
-homedir.o: homedir.c setup.h config.h ../lib/config.dj ../lib/setup.h \
-  ../lib/config.h homedir.h ../lib/memdebug.h
-hugehelp.o: hugehelp.c hugehelp.h
-main.o: main.c setup.h config.h ../lib/config.dj ../lib/setup.h \
+djgpp/getpass.o: getpass.c setup.h config.h ../lib/config.dj ../lib/setup.h \
+  ../lib/config.h getpass.h
+djgpp/homedir.o: homedir.c setup.h config.h ../lib/config.dj ../lib/setup.h \
+  ../lib/config.h homedir.h
+djgpp/hugehelp.o: hugehelp.c setup.h config.h ../lib/config.dj ../lib/setup.h \
+  ../lib/config.h hugehelp.h e:/djgpp/contrib/zlib/zlib.h \
+  e:/djgpp/contrib/zlib/zconf.h
+djgpp/main.o: main.c setup.h config.h ../lib/config.dj ../lib/setup.h \
   ../lib/config.h ../include/curl/curl.h ../include/curl/curlver.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 \
-  hugehelp.h version.h ../lib/strtoofft.h ../lib/memdebug.h
-urlglob.o: urlglob.c setup.h config.h ../lib/config.dj ../lib/setup.h \
+  ../include/curl/easy.h ../include/curl/multi.h urlglob.h writeout.h \
+  getpass.h homedir.h hugehelp.h writeenv.h version.h ../lib/curlx.h \
+  ../include/curl/mprintf.h ../lib/strequal.h ../lib/strtoofft.h \
+  ../lib/timeval.h ../lib/memdebug.h ../lib/memory.h
+djgpp/urlglob.o: urlglob.c setup.h config.h ../lib/config.dj ../lib/setup.h \
   ../lib/config.h ../include/curl/curl.h ../include/curl/curlver.h \
-  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
-  ../include/curl/mprintf.h urlglob.h ../lib/memdebug.h
-writeenv.o: writeenv.c setup.h config.h ../lib/config.dj ../lib/setup.h \
-  ../lib/config.h
-writeout.o: writeout.c setup.h config.h ../lib/config.dj ../lib/setup.h \
+  ../include/curl/easy.h ../include/curl/multi.h \
+  ../include/curl/mprintf.h urlglob.h
+djgpp/writeenv.o: writeenv.c setup.h config.h ../lib/config.dj ../lib/setup.h \
   ../lib/config.h ../include/curl/curl.h ../include/curl/curlver.h \
-  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
+  ../include/curl/easy.h ../include/curl/multi.h
+djgpp/writeout.o: writeout.c setup.h config.h ../lib/config.dj ../lib/setup.h \
+  ../lib/config.h ../include/curl/curl.h ../include/curl/curlver.h \
+  ../include/curl/easy.h ../include/curl/multi.h \
   ../include/curl/mprintf.h writeout.h