Reorganize more files into subdirectories (#834)

More on the reorg effort for easier hacking on the source.

Fix By: Brad House (@bradh352)

Makefile.Watcom

@@ -100,12 +100,14 @@ $(OBJ_BASE):
 	-$(MD) $^@\stat\dsa
 	-$(MD) $^@\stat\event
 	-$(MD) $^@\stat\legacy
+	-$(MD) $^@\stat\record
 	-$(MD) $^@\stat\str
 	-$(MD) $^@\stat\util
 	-$(MD) $^@\dyn
 	-$(MD) $^@\dyn\dsa
 	-$(MD) $^@\dyn\event
 	-$(MD) $^@\dyn\legacy
+	-$(MD) $^@\dyn\record
 	-$(MD) $^@\dyn\str
 	-$(MD) $^@\dyn\util
 	-$(MD) $^@\tools
@@ -142,12 +144,14 @@ vclean realclean: clean .SYMBOLIC
 	-$(RD) $(OBJ_BASE)\stat\dsa
 	-$(RD) $(OBJ_BASE)\stat\event
 	-$(RD) $(OBJ_BASE)\stat\legacy
+	-$(RD) $(OBJ_BASE)\stat\record
 	-$(RD) $(OBJ_BASE)\stat\str
 	-$(RD) $(OBJ_BASE)\stat\util
 	-$(RD) $(OBJ_BASE)\dyn
 	-$(RD) $(OBJ_BASE)\dyn\dsa
 	-$(RD) $(OBJ_BASE)\dyn\event
 	-$(RD) $(OBJ_BASE)\dyn\legacy
+	-$(RD) $(OBJ_BASE)\dyn\record
 	-$(RD) $(OBJ_BASE)\dyn\str
 	-$(RD) $(OBJ_BASE)\dyn\util
 	-$(RD) $(OBJ_BASE)\tools
@@ -176,6 +180,10 @@ $(RESOURCE): src\lib\cares.rc .AUTODEPEND
 {legacy}.c{$(OBJ_BASE)\dyn\legacy}.obj:
 	$(CC) $(CFLAGS) -bd .\src\lib\legacy\$^& -fo=$^@
 
+.ERASE
+{record}.c{$(OBJ_BASE)\dyn\record}.obj:
+	$(CC) $(CFLAGS) -bd .\src\lib\record\$^& -fo=$^@
+
 .ERASE
 {str}.c{$(OBJ_BASE)\dyn\str}.obj:
 	$(CC) $(CFLAGS) -bd .\src\lib\str\$^& -fo=$^@
@@ -200,6 +208,10 @@ $(RESOURCE): src\lib\cares.rc .AUTODEPEND
 {legacy}.c{$(OBJ_BASE)\stat\legacy}.obj:
 	$(CC) $(CFLAGS) -DCARES_STATICLIB .\src\lib\legacy\$^& -fo=$^@
 
+.ERASE
+{record}.c{$(OBJ_BASE)\stat\record}.obj:
+	$(CC) $(CFLAGS) -DCARES_STATICLIB .\src\lib\record\$^& -fo=$^@
+
 .ERASE
 {str}.c{$(OBJ_BASE)\stat\str}.obj:
 	$(CC) $(CFLAGS) -DCARES_STATICLIB .\src\lib\str\$^& -fo=$^@

Makefile.dj

@@ -12,7 +12,7 @@ OBJECTS = $(addprefix $(OBJ_DIR)/, \
 CSRC = $(addprefix src/lib/, $(CSOURCES))
 #CSRC := $(filter-out src/lib/windows_port.c, $(CSOURCES))
 
-OBJ_SUBDIRS = $(OBJ_DIR)/dsa $(OBJ_DIR)/event $(OBJ_DIR)/legacy $(OBJ_DIR)/str $(OBJ_DIR)/util
+OBJ_SUBDIRS = $(OBJ_DIR)/dsa $(OBJ_DIR)/event $(OBJ_DIR)/legacy $(OBJ_DIR)/record $(OBJ_DIR)/str $(OBJ_DIR)/util
 
 VPATH = src/lib src/tools
 

Makefile.msvc

@@ -329,6 +329,9 @@ PROG3_OBJS = $(PROG3_OBJS) $(PROG3_OBJDIR)\ahost.obj
 {$(SRCDIR)\src\lib\legacy}.c{$(CARES_OBJDIR)\legacy}.obj:
     $(CC_CMD) $(CC_CFLAGS) $(CARES_CFLAGS) /Fo$@ /Fd$(@D)\ /c $<
 
+{$(SRCDIR)\src\lib\record}.c{$(CARES_OBJDIR)\record}.obj:
+    $(CC_CMD) $(CC_CFLAGS) $(CARES_CFLAGS) /Fo$@ /Fd$(@D)\ /c $<
+
 {$(SRCDIR)\src\lib\str}.c{$(CARES_OBJDIR)\str}.obj:
     $(CC_CMD) $(CC_CFLAGS) $(CARES_CFLAGS) /Fo$@ /Fd$(@D)\ /c $<
 
@@ -416,6 +419,7 @@ $(CARES_OBJDIR): $(CARES_OUTDIR)
     @if not exist $(CARES_OBJDIR)\dsa mkdir $(CARES_OBJDIR)\dsa
     @if not exist $(CARES_OBJDIR)\event mkdir $(CARES_OBJDIR)\event
     @if not exist $(CARES_OBJDIR)\legacy mkdir $(CARES_OBJDIR)\legacy
+    @if not exist $(CARES_OBJDIR)\record mkdir $(CARES_OBJDIR)\record
     @if not exist $(CARES_OBJDIR)\str mkdir $(CARES_OBJDIR)\str
     @if not exist $(CARES_OBJDIR)\util mkdir $(CARES_OBJDIR)\util
 
@@ -431,6 +435,7 @@ clean:
     @-RMDIR /S /Q $(CARES_OBJDIR)\dsa >NUL 2>&1
     @-RMDIR /S /Q $(CARES_OBJDIR)\event >NUL 2>&1
     @-RMDIR /S /Q $(CARES_OBJDIR)\legacy >NUL 2>&1
+    @-RMDIR /S /Q $(CARES_OBJDIR)\record >NUL 2>&1
     @-RMDIR /S /Q $(CARES_OBJDIR)\str >NUL 2>&1
     @-RMDIR /S /Q $(CARES_OBJDIR)\util >NUL 2>&1
     @-RMDIR /S /Q $(CARES_OUTDIR) >NUL 2>&1

src/lib/Makefile.inc

@@ -13,12 +13,6 @@ CSOURCES = ares__addrinfo2hostent.c	\
   ares_cookie.c				\
   ares_data.c				\
   ares_destroy.c			\
-  ares_dns_mapping.c			\
-  ares_dns_multistring.c		\
-  ares_dns_name.c			\
-  ares_dns_parse.c			\
-  ares_dns_record.c			\
-  ares_dns_write.c			\
   ares_free_hostent.c			\
   ares_free_string.c			\
   ares_freeaddrinfo.c			\
@@ -79,6 +73,12 @@ CSOURCES = ares__addrinfo2hostent.c	\
   legacy/ares_parse_srv_reply.c		\
   legacy/ares_parse_txt_reply.c		\
   legacy/ares_parse_uri_reply.c		\
+  record/ares_dns_mapping.c		\
+  record/ares_dns_multistring.c		\
+  record/ares_dns_name.c		\
+  record/ares_dns_parse.c		\
+  record/ares_dns_record.c		\
+  record/ares_dns_write.c		\
   str/ares__buf.c			\
   str/ares_strcasecmp.c			\
   str/ares_str.c			\
@@ -91,8 +91,6 @@ CSOURCES = ares__addrinfo2hostent.c	\
 
 HHEADERS = ares_android.h			\
   ares_data.h				\
-  ares_dns_multistring.h		\
-  ares_dns_private.h			\
   ares_getenv.h				\
   ares_inet_net_pton.h			\
   ares_ipv6.h				\
@@ -108,6 +106,8 @@ HHEADERS = ares_android.h			\
   dsa/ares__slist.h			\
   event/ares_event.h			\
   event/ares_event_win32.h		\
+  record/ares_dns_multistring.h		\
+  record/ares_dns_private.h		\
   str/ares__buf.h			\
   str/ares_strcasecmp.h			\
   str/ares_str.h			\

src/lib/ares_private.h

@@ -111,9 +111,9 @@ typedef struct ares_rand_state ares_rand_state;
 #include "dsa/ares__htable_szvp.h"
 #include "dsa/ares__htable_asvp.h"
 #include "dsa/ares__htable_vpvp.h"
-#include "ares_dns_multistring.h"
+#include "record/ares_dns_multistring.h"
 #include "str/ares__buf.h"
-#include "ares_dns_private.h"
+#include "record/ares_dns_private.h"
 #include "util/ares__iface_ips.h"
 #include "util/ares__threads.h"