asn1: NTMakefile include oid_resolution.obj in LIBASN1_OBJS

oid_resolution.obj does not depend upon $(LIBASN1_OBJ) object
files.  It depends upon the generated .x files produced by
asn1_compile.exe when building $(gen_files_xxx).   Create a
new list of those dependencies explicitly for oid_resolution.obj.

Change-Id: I09a4dc9efb7a84e68da939b6a3ec5f55354c02ee
This commit is contained in:
Jeffrey Altman
2022-01-05 01:13:01 -05:00
committed by Nico Williams
parent ec866e635e
commit a4ba38ff7e

View File

@@ -112,6 +112,21 @@ $(BINDIR)\asn1_gen.exe: $(OBJ)\asn1_gen.obj $(LIBHEIMDAL)
$(EXECONLINK) $(LIBVERS) $(LIBROKEN)
$(EXEPREP)
LIBASN1_X= \
$(gen_files_rfc2459) \
$(gen_files_rfc4108) \
$(gen_files_cms) \
$(gen_files_krb5) \
$(gen_files_ocsp) \
$(gen_files_pkinit) \
$(gen_files_pkcs8) \
$(gen_files_pkcs9) \
$(gen_files_pkcs10) \
$(gen_files_pkcs12) \
$(gen_files_digest) \
$(gen_files_kx509) \
$(gen_files_x690sample)
LIBASN1_OBJS= \
$(OBJ)\der.obj \
$(OBJ)\der_get.obj \
@@ -124,6 +139,7 @@ LIBASN1_OBJS= \
$(OBJ)\der_format.obj \
$(OBJ)\template.obj \
$(OBJ)\extra.obj \
$(OBJ)\oid_resolution.obj \
$(OBJ)\timegm.obj \
$(gen_files_rfc2459:.x=.obj) \
$(gen_files_rfc4108:.x=.obj) \
@@ -140,11 +156,9 @@ LIBASN1_OBJS= \
$(gen_files_x690sample:.x=.obj) \
$(OBJ)\asn1_err.obj
$(OBJ)\oid_resolution.obj: $(LIBASN1_OBJS)
$(OBJ)\oid_resolution.obj: $(LIBASN1_X)
LIBASN1_OBJS2= $(LIBASN1_OBJS) $(OBJ)\oid_resolution.obj
$(LIBASN1): $(LIBASN1_OBJS2)
$(LIBASN1): $(LIBASN1_OBJS)
$(LIBCON_C) -out:$@ @<<
$(**: =
)