asn1: Fix Windows build

This commit is contained in:
Nicolas Williams
2021-03-11 09:50:48 -06:00
parent 4d39e8c1b2
commit a858821194

View File

@@ -61,6 +61,8 @@ gen_files_test = $(OBJ)\asn1_test_asn1.x
gen_files_test_template = $(OBJ)\asn1_test_template_asn1.x
gen_files_x690sample_template = $(OBJ)\asn1_x690sample_template_asn1.x
gen_files_digest = $(OBJ)\asn1_digest_asn1.x
gen_files_kx509 = $(OBJ)\asn1_kx509_asn1.x
@@ -196,6 +198,8 @@ $(gen_files_test:.x=.c) : $$(@R).x
$(gen_files_test_template:.x=.c) : $$(@R).x
$(gen_files_x690sample_template:.x=.c) : $$(@R).x
$(gen_files_krb5) $(OBJ)\krb5_asn1.hx: $(BINDIR)\asn1_compile.exe krb5.asn1 krb5.opt
cd $(OBJ)
$(BINDIR)\asn1_compile.exe \
@@ -329,6 +333,15 @@ $(gen_files_test_template) $(OBJ)\test_template_asn1.hx: $(BINDIR)\asn1_compile.
|| ($(RM) $(OBJ)\test_template_asn1.h ; exit /b 1)
cd $(SRCDIR)
$(gen_files_x690sample_template) $(OBJ)\x690sample_template_asn1.hx: $(BINDIR)\asn1_compile.exe x690sample.asn1
cd $(OBJ)
$(BINDIR)\asn1_compile.exe \
--template \
--one-code-file --template \
$(SRCDIR)\x690sample.asn1 x690sample_template_asn1 \
|| ($(RM) $(OBJ)\x690sample_template_asn1.h ; exit /b 1)
cd $(SRCDIR)
INCFILES= \
$(INCDIR)\der.h \
$(INCDIR)\heim_asn1.h \
@@ -450,7 +463,8 @@ $(OBJ)\check-der.exe: $(OBJ)\check-der.obj $(OBJ)\check-common.obj \
$(EXEPREP_NODIST)
$(OBJ)\check-gen-template.exe: $(OBJ)\check-gen.obj $(OBJ)\check-common.obj \
$(LIBHEIMDAL) $(LIBROKEN) $(gen_files_test_template:.x=.obj)
$(LIBHEIMDAL) $(LIBROKEN) $(gen_files_test_template:.x=.obj) \
$(gen_files_x690sample_template:.x=.obj)
$(EXECONLINK)
$(EXEPREP_NODIST)