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

diff --git a/CHANGES b/CHANGES
index 2f964ec86927ade460fdecc2fb26b3dde55b3502..d958e6750f31d56bd15fa2fb33b3aed654a2b4f3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 
        --- 9.5.1rc2 released ---
 
+2513   [bug]           Fix windows cli build. [RT #19062]
+
 2510.  [bug]           "dig +sigchase" could trigger REQUIRE failures.
                        [RT #19033]
 

diff --git a/lib/dns/win32/libdns.mak b/lib/dns/win32/libdns.mak
index 0a324da07ce7b5639d08038d44c83b72f5089511..d388c7c4609e0df06a671ccafe1e5c1df368d40d 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"
@@ -266,6 +267,7 @@ LINK32_OBJS= \
        "$(INTDIR)\dnssec.obj" \
        "$(INTDIR)\ds.obj" \
        "$(INTDIR)\forward.obj" \
+       "$(INTDIR)\iptable.obj" \
        "$(INTDIR)\journal.obj" \
        "$(INTDIR)\keytable.obj" \
        "$(INTDIR)\lib.obj" \
@@ -405,6 +407,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"
@@ -575,6 +579,7 @@ BSC32_SBRS= \
        "$(INTDIR)\dnssec.sbr" \
        "$(INTDIR)\ds.sbr" \
        "$(INTDIR)\forward.sbr" \
+       "$(INTDIR)\iptable.sbr" \
        "$(INTDIR)\journal.sbr" \
        "$(INTDIR)\keytable.sbr" \
        "$(INTDIR)\lib.sbr" \
@@ -661,6 +666,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 3b5fc556f95d07b3ad2c0223242ba6ceb624fdc1..43437e2d2173836ce9ad115e9d445e334dfabd1d 100644 (file)
--- a/lib/isc/win32/libisc.mak
+++ b/lib/isc/win32/libisc.mak
@@ -159,6 +159,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"
@@ -258,6 +259,7 @@ LINK32_OBJS= \
        "$(INTDIR)\netscope.obj" \
        "$(INTDIR)\ondestroy.obj" \
        "$(INTDIR)\quota.obj" \
+       "$(INTDIR)\radix.obj" \
        "$(INTDIR)\random.obj" \
        "$(INTDIR)\ratelimiter.obj" \
        "$(INTDIR)\refcount.obj" \
@@ -386,6 +388,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"
@@ -509,6 +513,7 @@ BSC32_SBRS= \
        "$(INTDIR)\netscope.sbr" \
        "$(INTDIR)\ondestroy.sbr" \
        "$(INTDIR)\quota.sbr" \
+       "$(INTDIR)\radix.sbr" \
        "$(INTDIR)\random.sbr" \
        "$(INTDIR)\ratelimiter.sbr" \
        "$(INTDIR)\refcount.sbr" \
@@ -591,6 +596,7 @@ LINK32_OBJS= \
        "$(INTDIR)\netscope.obj" \
        "$(INTDIR)\ondestroy.obj" \
        "$(INTDIR)\quota.obj" \
+       "$(INTDIR)\radix.obj" \
        "$(INTDIR)\random.obj" \
        "$(INTDIR)\ratelimiter.obj" \
        "$(INTDIR)\refcount.obj" \
@@ -1362,6 +1368,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