Added TOPDIR variable. Put dependencies in external file.

Added -DHAVE_STRUCT_TIMEVAL to CFLAGS.

1 files changed, 7 insertions, 131 deletions

diff --git a/Makefile.dj b/Makefile.dj
index f8156e1..c215abf 100644
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -4,6 +4,8 @@
 #
 # $Id$
 
+TOPDIR = ..
+
 include ../packages/DOS/common.dj
 
 include Makefile.inc
@@ -18,7 +20,8 @@ CFLAGS += -DWATT32 -DHAVE_AF_INET6 -DHAVE_PF_INET6 -DHAVE_FIONBIO \
           -DSEND_TYPE_ARG4='int'   -DSEND_TYPE_RETV='int' \
           -DRECV_TYPE_ARG1='int'   -DRECV_TYPE_ARG2='void*' \
           -DRECV_TYPE_ARG3='int'   -DRECV_TYPE_ARG4='int' \
-          -DRECV_TYPE_RETV='int'   -UHAVE_CONFIG_H
+          -DRECV_TYPE_RETV='int'   -DHAVE_STRUCT_TIMEVAL \
+          -UHAVE_CONFIG_H
 
 LDFLAGS = -s
 
@@ -59,135 +62,8 @@ clean:
 	rm -f $(OBJECTS) libcares.a
 
 vclean realclean: clean
-	rm -f ahost.exe adig.exe
+	rm -f ahost.exe adig.exe depend.dj
 	- rmdir $(OBJ_DIR)
 
-# DO NOT DELETE THIS LINE
-$(OBJ_DIR)/ares_fds.o: ares_fds.c setup.h setup_once.h ares.h ares_private.h \
-  ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/ares_getsock.o: ares_getsock.c setup.h setup_once.h ares.h ares_private.h \
-  ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/ares_process.o: ares_process.c setup.h setup_once.h ares.h ares_dns.h \
-  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/ares_free_hostent.o: ares_free_hostent.c setup.h setup_once.h ares.h \
-  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/ares_query.o: ares_query.c setup.h setup_once.h ares.h ares_dns.h \
-  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/ares__close_sockets.o: ares__close_sockets.c setup.h setup_once.h ares.h \
-  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/ares_free_string.o: ares_free_string.c setup.h setup_once.h ares.h \
-  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/ares_search.o: ares_search.c setup.h setup_once.h ares.h ares_private.h \
-  ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/ares__get_hostent.o: ares__get_hostent.c setup.h setup_once.h ares.h \
-  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h inet_net_pton.h
-$(OBJ_DIR)/ares_gethostbyaddr.o: ares_gethostbyaddr.c setup.h setup_once.h ares.h \
-  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h inet_net_pton.h
-$(OBJ_DIR)/ares_send.o: ares_send.c setup.h setup_once.h ares.h ares_dns.h \
-  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/ares__read_line.o: ares__read_line.c setup.h setup_once.h ares.h \
-  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/ares_gethostbyname.o: ares_gethostbyname.c setup.h setup_once.h ares.h \
-  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h inet_net_pton.h \
-  bitncmp.h
-$(OBJ_DIR)/ares_strerror.o: ares_strerror.c setup.h setup_once.h ares.h
-$(OBJ_DIR)/ares_cancel.o: ares_cancel.c setup.h setup_once.h ares.h ares_private.h \
-  ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/ares_init.o: ares_init.c setup.h setup_once.h ares.h ares_private.h \
-  ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h inet_net_pton.h
-$(OBJ_DIR)/ares_timeout.o: ares_timeout.c setup.h setup_once.h ares.h ares_private.h \
-  ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/ares_destroy.o: ares_destroy.c setup.h setup_once.h ares.h ares_private.h \
-  ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/ares_mkquery.o: ares_mkquery.c setup.h setup_once.h ares.h ares_dns.h \
-  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/ares_version.o: ares_version.c setup.h setup_once.h ares_version.h
-$(OBJ_DIR)/ares_expand_name.o: ares_expand_name.c setup.h setup_once.h ares.h \
-  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/ares_parse_a_reply.o: ares_parse_a_reply.c setup.h setup_once.h ares.h \
-  ares_dns.h ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/windows_port.o: windows_port.c setup.h setup_once.h
-$(OBJ_DIR)/ares_expand_string.o: ares_expand_string.c setup.h setup_once.h ares.h \
-  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/ares_parse_ptr_reply.o: ares_parse_ptr_reply.c setup.h setup_once.h \
-  ares.h ares_dns.h ares_private.h ares_ipv6.h ../lib/memdebug.h \
-  ../lib/setup.h ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/ares_parse_aaaa_reply.o: ares_parse_aaaa_reply.c setup.h setup_once.h \
-  ares.h ares_dns.h inet_net_pton.h ares_private.h ares_ipv6.h \
-  ../lib/memdebug.h ../lib/setup.h ../include/curl/stdcheaders.h \
-  ../include/curl/curl.h ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h
-$(OBJ_DIR)/ares_getnameinfo.o: ares_getnameinfo.c setup.h setup_once.h ares.h \
-  ares_private.h ares_ipv6.h ../lib/memdebug.h ../lib/setup.h \
-  ../include/curl/stdcheaders.h ../include/curl/curl.h \
-  ../include/curl/curlver.h ../include/curl/easy.h \
-  ../include/curl/multi.h ../include/curl/curl.h inet_ntop.h
-$(OBJ_DIR)/inet_net_pton.o: inet_net_pton.c setup.h setup_once.h ares_ipv6.h \
-  inet_net_pton.h
-$(OBJ_DIR)/bitncmp.o: bitncmp.c bitncmp.h
-$(OBJ_DIR)/inet_ntop.o: inet_ntop.c setup.h setup_once.h ares_ipv6.h inet_ntop.h
+-include depend.dj
+