2513 [bug] Fix windows cli build. [RT #19062]

diff --git a/CHANGES b/CHANGES
index b85fb93640a6722bbe5083f8a015205a4c09dab5..27700e4c6ce9ce19b793de194478a2d891cca6ae 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2513   [bug]           Fix windows cli build. [RT #19062]
+
 2512.  [func]          Print a summary of the cached records which make up
                        the negative response.  [RT #18885]
 

diff --git a/lib/dns/win32/libdns.mak b/lib/dns/win32/libdns.mak
index 2296708c774f57fa7cb34202f163477cea588656..d4d3ef65fd39e68f55a11826e44c6c2cc9f893a5 100644 (file)
--- a/lib/dns/win32/libdns.mak
+++ b/lib/dns/win32/libdns.mak
@@ -145,6 +145,7 @@ CLEAN :
        -@erase "$(INTDIR)\gssapictx.obj"
        -@erase "$(INTDIR)\spnego.obj"
        -@erase "$(INTDIR)\hmac_link.obj"
+       -@erase "$(INTDIR)\iptable.obj"
        -@erase "$(INTDIR)\journal.obj"
        -@erase "$(INTDIR)\key.obj"
        -@erase "$(INTDIR)\keytable.obj"
@@ -267,6 +268,7 @@ LINK32_OBJS= \
        "$(INTDIR)\dnssec.obj" \
        "$(INTDIR)\ds.obj" \
        "$(INTDIR)\forward.obj" \
+       "$(INTDIR)\iptable.obj" \
        "$(INTDIR)\journal.obj" \
        "$(INTDIR)\keytable.obj" \
        "$(INTDIR)\lib.obj" \
@@ -407,6 +409,8 @@ CLEAN :
        -@erase "$(INTDIR)\spnego.sbr"
        -@erase "$(INTDIR)\hmac_link.obj"
        -@erase "$(INTDIR)\hmac_link.sbr"
+       -@erase "$(INTDIR)\iptable.obj"
+       -@erase "$(INTDIR)\iptable.sbr"
        -@erase "$(INTDIR)\journal.obj"
        -@erase "$(INTDIR)\journal.sbr"
        -@erase "$(INTDIR)\key.obj"
@@ -579,6 +583,7 @@ BSC32_SBRS= \
        "$(INTDIR)\dnssec.sbr" \
        "$(INTDIR)\ds.sbr" \
        "$(INTDIR)\forward.sbr" \
+       "$(INTDIR)\iptable.sbr" \
        "$(INTDIR)\journal.sbr" \
        "$(INTDIR)\keytable.sbr" \
        "$(INTDIR)\lib.sbr" \
@@ -666,6 +671,7 @@ LINK32_OBJS= \
        "$(INTDIR)\dnssec.obj" \
        "$(INTDIR)\ds.obj" \
        "$(INTDIR)\forward.obj" \
+       "$(INTDIR)\iptable.obj" \
        "$(INTDIR)\journal.obj" \
        "$(INTDIR)\keytable.obj" \
        "$(INTDIR)\lib.obj" \

diff --git a/lib/isc/win32/libisc.mak b/lib/isc/win32/libisc.mak
index 9e8e06ba2b21610d4a907443a470a20a7f84e168..ef7e74b03cc52656cb2bb1e568ae0232ffa98142 100644 (file)
--- a/lib/isc/win32/libisc.mak
+++ b/lib/isc/win32/libisc.mak
@@ -161,6 +161,7 @@ CLEAN :
        -@erase "$(INTDIR)\parseint.obj"
        -@erase "$(INTDIR)\portset.obj"
        -@erase "$(INTDIR)\quota.obj"
+       -@erase "$(INTDIR)\radix.obj"
        -@erase "$(INTDIR)\random.obj"
        -@erase "$(INTDIR)\ratelimiter.obj"
        -@erase "$(INTDIR)\refcount.obj"
@@ -262,6 +263,7 @@ LINK32_OBJS= \
        "$(INTDIR)\netscope.obj" \
        "$(INTDIR)\ondestroy.obj" \
        "$(INTDIR)\quota.obj" \
+       "$(INTDIR)\radix.obj" \
        "$(INTDIR)\random.obj" \
        "$(INTDIR)\ratelimiter.obj" \
        "$(INTDIR)\refcount.obj" \
@@ -394,6 +396,8 @@ CLEAN :
        -@erase "$(INTDIR)\portset.sbr"
        -@erase "$(INTDIR)\quota.obj"
        -@erase "$(INTDIR)\quota.sbr"
+       -@erase "$(INTDIR)\radix.obj"
+       -@erase "$(INTDIR)\radix.sbr"
        -@erase "$(INTDIR)\random.obj"
        -@erase "$(INTDIR)\random.sbr"
        -@erase "$(INTDIR)\ratelimiter.obj"
@@ -519,6 +523,7 @@ BSC32_SBRS= \
        "$(INTDIR)\netscope.sbr" \
        "$(INTDIR)\ondestroy.sbr" \
        "$(INTDIR)\quota.sbr" \
+       "$(INTDIR)\radix.sbr" \
        "$(INTDIR)\random.sbr" \
        "$(INTDIR)\ratelimiter.sbr" \
        "$(INTDIR)\refcount.sbr" \
@@ -603,6 +608,7 @@ LINK32_OBJS= \
        "$(INTDIR)\netscope.obj" \
        "$(INTDIR)\ondestroy.obj" \
        "$(INTDIR)\quota.obj" \
+       "$(INTDIR)\radix.obj" \
        "$(INTDIR)\random.obj" \
        "$(INTDIR)\ratelimiter.obj" \
        "$(INTDIR)\refcount.obj" \
@@ -831,22 +837,6 @@ SOURCE=.\ipv6.c
 !ENDIF 
 
 
-SOURCE=..\iterated_hash.c
-
-!IF  "$(CFG)" == "libisc - Win32 Release"
-
-
-"$(INTDIR)\iterated_hash.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
-
-
-"$(INTDIR)\iterated_hash.obj"  "$(INTDIR)\iterated_hash.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
 SOURCE=.\keyboard.c
 
 !IF  "$(CFG)" == "libisc - Win32 Release"
@@ -1409,6 +1399,24 @@ SOURCE=..\inet_pton.c
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
+SOURCE=..\iterated_hash.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\iterated_hash.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\iterated_hash.obj"  "$(INTDIR)\iterated_hash.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 !ENDIF 
 
 SOURCE=..\lex.c