oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Generate .x source files as .c source files

Browse Source 
The generated .x source and .hx header files are plain C source files.
Generate them as .c source files and avoid unnecessary file copying
and special makefile rules.

Change-Id: Ifc4bbe3c46dd357fdd642040ad964c7cfe1d395c
This commit is contained in:
Jeffrey Altman
2022-01-05 15:45:23 -05:00
committed by Nicolas Williams
parent 4919daa7ab
commit 9427796f1a
10 changed files with 311 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

244
lib/asn1/Makefile.am
View File

@@ -30,64 +30,64 @@ libasn1template_la_LIBADD = \
@LIB_com_err@ \ @LIB_com_err@ \
$(LIBADD_roken) $(LIBADD_roken)
BUILT_SOURCES = \ BUILT_SOURCES = \
$(gen_files_rfc2459:.x=.c) \ $(gen_files_rfc2459) \
$(gen_files_rfc4108:.x=.c) \ $(gen_files_rfc4108) \
$(gen_files_cms:.x=.c) \ $(gen_files_cms) \
$(gen_files_krb5:.x=.c) \ $(gen_files_krb5) \
$(gen_files_ocsp:.x=.c) \ $(gen_files_ocsp) \
$(gen_files_pkinit:.x=.c) \ $(gen_files_pkinit) \
$(gen_files_pkcs8:.x=.c) \ $(gen_files_pkcs8) \
$(gen_files_pkcs9:.x=.c) \ $(gen_files_pkcs9) \
$(gen_files_pkcs10:.x=.c) \ $(gen_files_pkcs10) \
$(gen_files_pkcs12:.x=.c) \ $(gen_files_pkcs12) \
$(gen_files_digest:.x=.c) \ $(gen_files_digest) \
$(gen_files_kx509:.x=.c) $(gen_files_kx509)
BUILT_TEMPLATE_SOURCES = \ BUILT_TEMPLATE_SOURCES = \
$(gen_files_rfc2459_template:.x=.c) \ $(gen_files_rfc2459_template) \
$(gen_files_rfc4108_template:.x=.c) \ $(gen_files_rfc4108_template) \
$(gen_files_cms_template:.x=.c) \ $(gen_files_cms_template) \
$(gen_files_krb5_template:.x=.c) \ $(gen_files_krb5_template) \
$(gen_files_ocsp_template:.x=.c) \ $(gen_files_ocsp_template) \
$(gen_files_pkinit_template:.x=.c) \ $(gen_files_pkinit_template) \
$(gen_files_pkcs8_template:.x=.c) \ $(gen_files_pkcs8_template) \
$(gen_files_pkcs9_template:.x=.c) \ $(gen_files_pkcs9_template) \
$(gen_files_pkcs10_template:.x=.c) \ $(gen_files_pkcs10_template) \
$(gen_files_pkcs12_template:.x=.c) \ $(gen_files_pkcs12_template) \
$(gen_files_digest_template:.x=.c) \ $(gen_files_digest_template) \
$(gen_files_kx509_template:.x=.c) $(gen_files_kx509_template)
gen_files_krb5 = asn1_krb5_asn1.x gen_files_krb5 = asn1_krb5_asn1.c
gen_files_krb5_template = asn1_krb5_template_asn1.x gen_files_krb5_template = asn1_krb5_template_asn1.c
gen_files_cms = asn1_cms_asn1.x gen_files_cms = asn1_cms_asn1.c
gen_files_cms_template = asn1_cms_template_asn1.x gen_files_cms_template = asn1_cms_template_asn1.c
gen_files_crmf = asn1_crmf_asn1.x gen_files_crmf = asn1_crmf_asn1.c
gen_files_crmf_template = asn1_crmf_template_asn1.x gen_files_crmf_template = asn1_crmf_template_asn1.c
gen_files_rfc2459 = asn1_rfc2459_asn1.x gen_files_rfc2459 = asn1_rfc2459_asn1.c
gen_files_rfc2459_template = asn1_rfc2459_template_asn1.x gen_files_rfc2459_template = asn1_rfc2459_template_asn1.c
gen_files_rfc4108 = asn1_rfc4108_asn1.x gen_files_rfc4108 = asn1_rfc4108_asn1.c
gen_files_rfc4108_template = asn1_rfc4108_template_asn1.x gen_files_rfc4108_template = asn1_rfc4108_template_asn1.c
gen_files_ocsp = asn1_ocsp_asn1.x gen_files_ocsp = asn1_ocsp_asn1.c
gen_files_ocsp_template = asn1_ocsp_template_asn1.x gen_files_ocsp_template = asn1_ocsp_template_asn1.c
gen_files_pkinit = asn1_pkinit_asn1.x gen_files_pkinit = asn1_pkinit_asn1.c
gen_files_pkinit_template = asn1_pkinit_template_asn1.x gen_files_pkinit_template = asn1_pkinit_template_asn1.c
gen_files_pkcs10 = asn1_pkcs10_asn1.x gen_files_pkcs10 = asn1_pkcs10_asn1.c
gen_files_pkcs10_template = asn1_pkcs10_template_asn1.x gen_files_pkcs10_template = asn1_pkcs10_template_asn1.c
gen_files_pkcs12 = asn1_pkcs12_asn1.x gen_files_pkcs12 = asn1_pkcs12_asn1.c
gen_files_pkcs12_template = asn1_pkcs12_template_asn1.x gen_files_pkcs12_template = asn1_pkcs12_template_asn1.c
gen_files_pkcs8 = asn1_pkcs8_asn1.x gen_files_pkcs8 = asn1_pkcs8_asn1.c
gen_files_pkcs8_template = asn1_pkcs8_template_asn1.x gen_files_pkcs8_template = asn1_pkcs8_template_asn1.c
gen_files_pkcs9 = asn1_pkcs9_asn1.x gen_files_pkcs9 = asn1_pkcs9_asn1.c
gen_files_pkcs9_template = asn1_pkcs9_template_asn1.x gen_files_pkcs9_template = asn1_pkcs9_template_asn1.c
gen_files_test = asn1_test_asn1.x gen_files_test = asn1_test_asn1.c
gen_files_test_template = asn1_test_template_asn1.x gen_files_test_template = asn1_test_template_asn1.c
gen_files_digest = asn1_digest_asn1.x gen_files_digest = asn1_digest_asn1.c
gen_files_digest_template = asn1_digest_template_asn1.x gen_files_digest_template = asn1_digest_template_asn1.c
gen_files_kx509 = asn1_kx509_asn1.x gen_files_kx509 = asn1_kx509_asn1.c
gen_files_kx509_template = asn1_kx509_template_asn1.x gen_files_kx509_template = asn1_kx509_template_asn1.c
gen_files_x690sample = asn1_x690sample_asn1.x gen_files_x690sample = asn1_x690sample_asn1.c
gen_files_x690sample_template = asn1_x690sample_template_asn1.x gen_files_x690sample_template = asn1_x690sample_template_asn1.c
oid_resolution.lo: $(BUILT_SOURCES) oid_resolution.lo: $(BUILT_SOURCES)
@@ -100,20 +100,20 @@ check_PROGRAMS = $(TESTS)
asn1_gen_SOURCES = asn1_gen.c asn1_gen_SOURCES = asn1_gen.c
asn1_print_SOURCES = asn1_print.c asn1_print_SOURCES = asn1_print.c
asn1_print_SOURCES += $(gen_files_x690sample_template:.x=.c) asn1_print_SOURCES += $(gen_files_x690sample_template)
asn1_print_CPPFLAGS = -DASN1_PRINT_SUPPORTED asn1_print_CPPFLAGS = -DASN1_PRINT_SUPPORTED
check_der_SOURCES = check-der.c check-common.c check-common.h check_der_SOURCES = check-der.c check-common.c check-common.h
check_template_SOURCES = check-template.c check-common.c check-common.h check_template_SOURCES = check-template.c check-common.c check-common.h
nodist_check_template_SOURCES = $(gen_files_test_template:.x=.c) nodist_check_template_SOURCES = $(gen_files_test_template)
check_gen_template_CPPFLAGS = -DASN1_IOS_SUPPORTED check_gen_template_CPPFLAGS = -DASN1_IOS_SUPPORTED
dist_check_gen_template_SOURCES = check-gen.c check-common.c check-common.h dist_check_gen_template_SOURCES = check-gen.c check-common.c check-common.h
nodist_check_gen_template_SOURCES = $(gen_files_test_template:.x=.c) \ nodist_check_gen_template_SOURCES = $(gen_files_test_template) \
$(gen_files_x690sample_template:.x=.c) $(gen_files_x690sample_template)
dist_check_gen_SOURCES = check-gen.c check-common.c check-common.h dist_check_gen_SOURCES = check-gen.c check-common.c check-common.h
nodist_check_gen_SOURCES = $(gen_files_test:.x=.c) $(gen_files_x690sample:.x=.c) nodist_check_gen_SOURCES = $(gen_files_test) $(gen_files_x690sample)
build_HEADERZ = asn1-template.h build_HEADERZ = asn1-template.h
@@ -229,37 +229,37 @@ CLEANFILES = \
$(nodist_check_gen_SOURCES) \ $(nodist_check_gen_SOURCES) \
asn1parse.c asn1parse.h lex.c \ asn1parse.c asn1parse.h lex.c \
asn1_err.c asn1_err.h \ asn1_err.c asn1_err.h \
rfc2459_asn1_files rfc2459_asn1*.h* rfc2459_asn1*.x \ rfc2459_asn1_files rfc2459_asn1*.h \
rfc2459_template_asn1_files rfc2459_template_asn1*.h* rfc2459_template_asn1*.x \ rfc2459_template_asn1_files rfc2459_template_asn1*.h \
rfc4108_asn1_files rfc4108_asn1*.h* rfc4108_asn1*.x \ rfc4108_asn1_files rfc4108_asn1*.h \
rfc4108_template_asn1_files rfc4108_template_asn1*.h* rfc4108_template_asn1*.x \ rfc4108_template_asn1_files rfc4108_template_asn1*.h \
cms_asn1_files cms_asn1*.h* cms_asn1*.x \ cms_asn1_files cms_asn1*.h \
cms_template_asn1_files cms_template_asn1*.h* cms_template_asn1*.x \ cms_template_asn1_files cms_template_asn1* \
crmf_asn1_files crmf_asn1*.h* crmf_asn1*.x \ crmf_asn1_files crmf_asn1* \
crmf_template_asn1_files crmf_template_asn1*.h* crmf_template_asn1*.x \ crmf_template_asn1_files crmf_template_asn1* \
krb5_asn1_files krb5_asn1*.h* krb5_asn1*.x \ krb5_asn1_files krb5_asn1* \
krb5_template_asn1_files krb5_template_asn1*.h* krb5_template_asn1*.x \ krb5_template_asn1_files krb5_template_asn1* \
ocsp_asn1_files ocsp_asn1*.h* ocsp_asn1*.x \ ocsp_asn1_files ocsp_asn1* \
ocsp_template_asn1_files ocsp_template_asn1*.h* ocsp_template_asn1*.x \ ocsp_template_asn1_files ocsp_template_asn1* \
pkinit_asn1_files pkinit_asn1*.h* pkinit_asn1*.x \ pkinit_asn1_files pkinit_asn1* \
pkinit_template_asn1_files pkinit_template_asn1*.h* pkinit_template_asn1*.x \ pkinit_template_asn1_files pkinit_template_asn1* \
pkcs8_asn1_files pkcs8_asn1*.h* pkcs8_asn1*.x* \ pkcs8_asn1_files pkcs8_asn1* \
pkcs8_template_asn1_files pkcs8_template_asn1*.h* pkcs8_template_asn1*.x* \ pkcs8_template_asn1_files pkcs8_template_asn1* \
pkcs9_asn1_files pkcs9_asn1*.h* pkcs9_asn1*.x \ pkcs9_asn1_files pkcs9_asn1* \
pkcs9_template_asn1_files pkcs9_template_asn1*.h* pkcs9_template_asn1*.x \ pkcs9_template_asn1_files pkcs9_template_asn1* \
pkcs10_asn1_files pkcs10_asn1*.h* pkcs10_asn1*.x \ pkcs10_asn1_files pkcs10_asn1* \
pkcs10_template_asn1_files pkcs10_template_asn1*.h* pkcs10_template_asn1*.x \ pkcs10_template_asn1_files pkcs10_template_asn1* \
pkcs12_asn1_files pkcs12_asn1*.h* pkcs12_asn1*.x \ pkcs12_asn1_files pkcs12_asn1* \
pkcs12_template_asn1_files pkcs12_template_asn1*.h* pkcs12_template_asn1*.x \ pkcs12_template_asn1_files pkcs12_template_asn1* \
digest_asn1_files digest_asn1*.h* digest_asn1*.x \ digest_asn1_files digest_asn1* \
digest_template_asn1_files digest_template_asn1*.h* digest_template_asn1*.x \ digest_template_asn1_files digest_template_asn1* \
kx509_asn1_files kx509_asn1*.h* kx509_asn1*.x \ kx509_asn1_files kx509_asn1* \
kx509_template_asn1_files kx509_template_asn1*.h* kx509_template_asn1*.x \ kx509_template_asn1_files kx509_template_asn1* \
x690sample_asn1_files x690sample_asn1*.h* x690sample_asn1*.x \ x690sample_asn1_files x690sample_asn1* \
x690sample_template_asn1_files x690sample_template_asn1*.h* x690sample_template_asn1*.x \ x690sample_template_asn1_files x690sample_template_asn1* \
test_asn1_files test_asn1*.h* test_asn1*.x \ test_asn1_files test_asn1* \
test_template_asn1_files test_template_asn1*.h* test_template_asn1*.x \ test_template_asn1_files test_template_asn1* \
asn1_*.tmp.c asn1_*.x asn1_*.json asn1_*.c *_asn1.json *_asn1_syms.c *_asn1_oids.c
dist_include_HEADERS = der.h heim_asn1.h dist_include_HEADERS = der.h heim_asn1.h
dist_include_HEADERS += $(srcdir)/der-protos.h $(srcdir)/der-private.h dist_include_HEADERS += $(srcdir)/der-protos.h $(srcdir)/der-private.h
@@ -338,36 +338,36 @@ $(asn1_print_OBJECTS): $(nodist_include_HEADERS) $(priv_headers)
asn1parse.h: asn1parse.c asn1parse.h: asn1parse.c
$(gen_files_krb5) krb5_asn1.hx krb5_asn1-priv.hx: krb5_asn1_files $(gen_files_krb5) krb5_asn1.h krb5_asn1-priv.h: krb5_asn1_files
$(gen_files_krb5_template) krb5_template_asn1.hx krb5_template_asn1-priv.hx: krb5_template_asn1_files $(gen_files_krb5_template) krb5_template_asn1.h krb5_template_asn1-priv.h: krb5_template_asn1_files
$(gen_files_ocsp) ocsp_asn1.hx ocsp_asn1-priv.hx: ocsp_asn1_files $(gen_files_ocsp) ocsp_asn1.h ocsp_asn1-priv.h: ocsp_asn1_files
$(gen_files_ocsp_template) ocsp_template_asn1.hx ocsp_template_asn1-priv.hx: ocsp_template_asn1_files $(gen_files_ocsp_template) ocsp_template_asn1.h ocsp_template_asn1-priv.h: ocsp_template_asn1_files
$(gen_files_pkinit) pkinit_asn1.hx pkinit_asn1-priv.hx: pkinit_asn1_files $(gen_files_pkinit) pkinit_asn1.h pkinit_asn1-priv.h: pkinit_asn1_files
$(gen_files_pkinit_template) pkinit_template_asn1.hx pkinit_template_asn1-priv.hx: pkinit_template_asn1_files $(gen_files_pkinit_template) pkinit_template_asn1.h pkinit_template_asn1-priv.h: pkinit_template_asn1_files
$(gen_files_pkcs8) pkcs8_asn1.hx pkcs8_asn1-priv.hx: pkcs8_asn1_files $(gen_files_pkcs8) pkcs8_asn1.h pkcs8_asn1-priv.h: pkcs8_asn1_files
$(gen_files_pkcs8_template) pkcs8_template_asn1.hx pkcs8_template_asn1-priv.hx: pkcs8_template_asn1_files $(gen_files_pkcs8_template) pkcs8_template_asn1.h pkcs8_template_asn1-priv.h: pkcs8_template_asn1_files
$(gen_files_pkcs9) pkcs9_asn1.hx pkcs9_asn1-priv.hx: pkcs9_asn1_files $(gen_files_pkcs9) pkcs9_asn1.h pkcs9_asn1-priv.h: pkcs9_asn1_files
$(gen_files_pkcs9_template) pkcs9_template_asn1.hx pkcs9_template_asn1-priv.hx: pkcs9_template_asn1_files $(gen_files_pkcs9_template) pkcs9_template_asn1.h pkcs9_template_asn1-priv.h: pkcs9_template_asn1_files
$(gen_files_pkcs10) pkcs10_asn1.hx pkcs10_asn1-priv.hx: pkcs10_asn1_files $(gen_files_pkcs10) pkcs10_asn1.h pkcs10_asn1-priv.h: pkcs10_asn1_files
$(gen_files_pkcs10_template) pkcs10_template_asn1.hx pkcs10_template_asn1-priv.hx: pkcs10_template_asn1_files $(gen_files_pkcs10_template) pkcs10_template_asn1.h pkcs10_template_asn1-priv.h: pkcs10_template_asn1_files
$(gen_files_pkcs12) pkcs12_asn1.hx pkcs12_asn1-priv.hx: pkcs12_asn1_files $(gen_files_pkcs12) pkcs12_asn1.h pkcs12_asn1-priv.h: pkcs12_asn1_files
$(gen_files_pkcs12_template) pkcs12_template_asn1.hx pkcs12_template_asn1-priv.hx: pkcs12_template_asn1_files $(gen_files_pkcs12_template) pkcs12_template_asn1.h pkcs12_template_asn1-priv.h: pkcs12_template_asn1_files
$(gen_files_digest) digest_asn1.hx digest_asn1-priv.hx: digest_asn1_files $(gen_files_digest) digest_asn1.h digest_asn1-priv.h: digest_asn1_files
$(gen_files_digest_template) digest_template_asn1.hx digest_template_asn1-priv.hx: digest_template_asn1_files $(gen_files_digest_template) digest_template_asn1.h digest_template_asn1-priv.h: digest_template_asn1_files
$(gen_files_kx509) kx509_asn1.hx kx509_asn1-priv.hx: kx509_asn1_files $(gen_files_kx509) kx509_asn1.h kx509_asn1-priv.h: kx509_asn1_files
$(gen_files_kx509_template) kx509_template_asn1.hx kx509_template_asn1-priv.hx: kx509_template_asn1_files $(gen_files_kx509_template) kx509_template_asn1.h kx509_template_asn1-priv.h: kx509_template_asn1_files
$(gen_files_rfc2459) rfc2459_asn1.hx rfc2459_asn1-priv.hx: rfc2459_asn1_files $(gen_files_rfc2459) rfc2459_asn1.h rfc2459_asn1-priv.h: rfc2459_asn1_files
$(gen_files_rfc2459_template) rfc2459_template_asn1.hx rfc2459_template_asn1-priv.hx: rfc2459_template_asn1_files $(gen_files_rfc2459_template) rfc2459_template_asn1.h rfc2459_template_asn1-priv.h: rfc2459_template_asn1_files
$(gen_files_rfc4108) rfc4108_asn1.hx rfc4108_asn1-priv.hx: rfc4108_asn1_files $(gen_files_rfc4108) rfc4108_asn1.h rfc4108_asn1-priv.h: rfc4108_asn1_files
$(gen_files_rfc4108_template) rfc4108_template_asn1.hx rfc4108_template_asn1-priv.hx: rfc4108_template_asn1_files $(gen_files_rfc4108_template) rfc4108_template_asn1.h rfc4108_template_asn1-priv.h: rfc4108_template_asn1_files
$(gen_files_cms) cms_asn1.hx cms_asn1-priv.hx: cms_asn1_files $(gen_files_cms) cms_asn1.h cms_asn1-priv.h: cms_asn1_files
$(gen_files_cms_template) cms_template_asn1.hx cms_template_asn1-priv.hx: cms_template_asn1_files $(gen_files_cms_template) cms_template_asn1.h cms_template_asn1-priv.h: cms_template_asn1_files
$(gen_files_crmf) crmf_asn1.hx crmf_asn1-priv.hx: crmf_asn1_files $(gen_files_crmf) crmf_asn1.h crmf_asn1-priv.h: crmf_asn1_files
$(gen_files_crmf_template) crmf_template_asn1.hx crmf_template_asn1-priv.hx: crmf_template_asn1_files $(gen_files_crmf_template) crmf_template_asn1.h crmf_template_asn1-priv.h: crmf_template_asn1_files
$(gen_files_x690sample) x690sample_asn1.hx x690sample_asn1-priv.hx: x690sample_asn1_files $(gen_files_x690sample) x690sample_asn1.h x690sample_asn1-priv.h: x690sample_asn1_files
$(gen_files_x690sample_template) x690sample_template_asn1.hx x690sample_template_asn1-priv.hx: x690sample_template_asn1_files $(gen_files_x690sample_template) x690sample_template_asn1.h x690sample_template_asn1-priv.h: x690sample_template_asn1_files
$(gen_files_test) test_asn1.hx test_asn1-priv.hx: test_asn1_files $(gen_files_test) test_asn1.h test_asn1-priv.h: test_asn1_files
$(gen_files_test_template) test_template_asn1.hx test_template_asn1-priv.hx: test_template_asn1_files $(gen_files_test_template) test_template_asn1.h test_template_asn1-priv.h: test_template_asn1_files
if ASN1_TEMPLATING if ASN1_TEMPLATING
TEMPLATE_OPTION=--template TEMPLATE_OPTION=--template

210
lib/asn1/NTMakefile
View File

@@ -35,38 +35,6 @@ intcflags=-I$(SRCDIR) -I$(OBJ) -DROKEN_RENAME -DASN1_IOS_SUPPORTED -DASN1_LIB
!include ../../windows/NTMakefile.w32 !include ../../windows/NTMakefile.w32
gen_files_krb5 = $(OBJ)\asn1_krb5_asn1.x
gen_files_cms = $(OBJ)\asn1_cms_asn1.x
gen_files_crmf = $(OBJ)\asn1_crmf_asn1.x
gen_files_rfc2459 = $(OBJ)\asn1_rfc2459_asn1.x
gen_files_rfc4108 = $(OBJ)\asn1_rfc4108_asn1.x
gen_files_ocsp = $(OBJ)\asn1_ocsp_asn1.x
gen_files_pkinit = $(OBJ)\asn1_pkinit_asn1.x
gen_files_pkcs12 = $(OBJ)\asn1_pkcs12_asn1.x
gen_files_pkcs8 = $(OBJ)\asn1_pkcs8_asn1.x
gen_files_pkcs9 = $(OBJ)\asn1_pkcs9_asn1.x
gen_files_pkcs10 = $(OBJ)\asn1_pkcs10_asn1.x
gen_files_test = $(OBJ)\asn1_test_asn1.x
gen_files_test_template = $(OBJ)\asn1_test_template_asn1.x
gen_files_digest = $(OBJ)\asn1_digest_asn1.x
gen_files_kx509 = $(OBJ)\asn1_kx509_asn1.x
gen_files_x690sample = $(OBJ)\asn1_x690sample_asn1.x
ASN1_BINARIES = \ ASN1_BINARIES = \
$(LIBEXECDIR)\asn1_compile.exe $(LIBEXECDIR)\asn1_compile.exe
@@ -113,19 +81,19 @@ $(BINDIR)\asn1_gen.exe: $(OBJ)\asn1_gen.obj $(LIBHEIMDAL)
$(EXEPREP) $(EXEPREP)
LIBASN1_X= \ LIBASN1_X= \
$(gen_files_rfc2459) \ $(OBJ)\asn1_rfc2459_asn1.c \
$(gen_files_rfc4108) \ $(OBJ)\asn1_rfc4108_asn1.c \
$(gen_files_cms) \ $(OBJ)\asn1_cms_asn1.c \
$(gen_files_krb5) \ $(OBJ)\asn1_krb5_asn1.c \
$(gen_files_ocsp) \ $(OBJ)\asn1_ocsp_asn1.c \
$(gen_files_pkinit) \ $(OBJ)\asn1_pkinit_asn1.c \
$(gen_files_pkcs8) \ $(OBJ)\asn1_pkcs8_asn1.c \
$(gen_files_pkcs9) \ $(OBJ)\asn1_pkcs9_asn1.c \
$(gen_files_pkcs10) \ $(OBJ)\asn1_pkcs10_asn1.c \
$(gen_files_pkcs12) \ $(OBJ)\asn1_pkcs12_asn1.c \
$(gen_files_digest) \ $(OBJ)\asn1_digest_asn1.c \
$(gen_files_kx509) \ $(OBJ)\asn1_kx509_asn1.c \
$(gen_files_x690sample) $(OBJ)\asn1_x690sample_asn1.c
LIBASN1_OBJS= \ LIBASN1_OBJS= \
$(OBJ)\der.obj \ $(OBJ)\der.obj \
@@ -141,19 +109,19 @@ LIBASN1_OBJS= \
$(OBJ)\extra.obj \ $(OBJ)\extra.obj \
$(OBJ)\oid_resolution.obj \ $(OBJ)\oid_resolution.obj \
$(OBJ)\timegm.obj \ $(OBJ)\timegm.obj \
$(gen_files_rfc2459:.x=.obj) \ $(OBJ)\asn1_rfc2459_asn1.obj \
$(gen_files_rfc4108:.x=.obj) \ $(OBJ)\asn1_rfc4108_asn1.obj \
$(gen_files_cms:.x=.obj) \ $(OBJ)\asn1_cms_asn1.obj \
$(gen_files_krb5:.x=.obj) \ $(OBJ)\asn1_krb5_asn1.obj \
$(gen_files_ocsp:.x=.obj) \ $(OBJ)\asn1_ocsp_asn1.obj \
$(gen_files_pkinit:.x=.obj) \ $(OBJ)\asn1_pkinit_asn1.obj \
$(gen_files_pkcs8:.x=.obj) \ $(OBJ)\asn1_pkcs8_asn1.obj \
$(gen_files_pkcs9:.x=.obj) \ $(OBJ)\asn1_pkcs9_asn1.obj \
$(gen_files_pkcs10:.x=.obj) \ $(OBJ)\asn1_pkcs10_asn1.obj \
$(gen_files_pkcs12:.x=.obj) \ $(OBJ)\asn1_pkcs12_asn1.obj \
$(gen_files_digest:.x=.obj) \ $(OBJ)\asn1_digest_asn1.obj \
$(gen_files_kx509:.x=.obj) \ $(OBJ)\asn1_kx509_asn1.obj \
$(gen_files_x690sample:.x=.obj) \ $(OBJ)\asn1_x690sample_asn1.obj \
$(OBJ)\asn1_err.obj $(OBJ)\asn1_err.obj
$(OBJ)\oid_resolution.obj: $(LIBASN1_X) $(OBJ)\oid_resolution.obj: $(LIBASN1_X)
@@ -186,19 +154,19 @@ LIBASN1_S_OBJS= \
$(OBJ)\extra.s.obj \ $(OBJ)\extra.s.obj \
$(OBJ)\oid_resolution.s.obj \ $(OBJ)\oid_resolution.s.obj \
$(OBJ)\timegm.s.obj \ $(OBJ)\timegm.s.obj \
$(gen_files_rfc2459:.x=.s.obj) \ $(OBJ)\asn1_rfc2459_asn1.s.obj \
$(gen_files_rfc4108:.x=.s.obj) \ $(OBJ)\asn1_rfc4108_asn1.s.obj \
$(gen_files_cms:.x=.s.obj) \ $(OBJ)\asn1_cms_asn1.s.obj \
$(gen_files_krb5:.x=.s.obj) \ $(OBJ)\asn1_krb5_asn1.s.obj \
$(gen_files_ocsp:.x=.s.obj) \ $(OBJ)\asn1_ocsp_asn1.s.obj \
$(gen_files_pkinit:.x=.s.obj) \ $(OBJ)\asn1_pkinit_asn1.s.obj \
$(gen_files_pkcs8:.x=.s.obj) \ $(OBJ)\asn1_pkcs8_asn1.s.obj \
$(gen_files_pkcs9:.x=.s.obj) \ $(OBJ)\asn1_pkcs9_asn1.s.obj \
$(gen_files_pkcs10:.x=.s.obj) \ $(OBJ)\asn1_pkcs10_asn1.s.obj \
$(gen_files_pkcs12:.x=.s.obj) \ $(OBJ)\asn1_pkcs12_asn1.s.obj \
$(gen_files_digest:.x=.s.obj) \ $(OBJ)\asn1_digest_asn1.s.obj \
$(gen_files_kx509:.x=.s.obj) \ $(OBJ)\asn1_kx509_asn1.s.obj \
$(gen_files_x690sample:.x=.s.obj) \ $(OBJ)\asn1_x690sample_asn1.s.obj \
$(OBJ)\asn1_err.s.obj $(OBJ)\asn1_err.s.obj
$(OBJ)\oid_resolution.s.obj: oid_resolution.c $(LIBASN1_X) $(OBJ)\oid_resolution.s.obj: oid_resolution.c $(LIBASN1_X)
@@ -240,43 +208,49 @@ $(OBJ)\extra.s.obj: extra.c
$(OBJ)\timegm.s.obj: timegm.c $(OBJ)\timegm.s.obj: timegm.c
$(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $** $(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $**
$(gen_files_rfc2459:.x=.s.obj): $(gen_files_rfc2459:.x=.c) $(OBJ)\asn1_rfc2459_asn1.s.obj: $(OBJ)\asn1_rfc2459_asn1.c
$(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $** $(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $**
$(gen_files_rfc4108:.x=.s.obj): $(gen_files_rfc4108:.x=.c) $(OBJ)\asn1_rfc4108_asn1.s.obj: $(OBJ)\asn1_rfc4108_asn1.c
$(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $** $(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $**
$(gen_files_cms:.x=.s.obj): $(gen_files_cms:.x=.c) $(OBJ)\asn1_cms_asn1.s.obj: $(OBJ)\asn1_cms_asn1.c
$(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $** $(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $**
$(gen_files_krb5:.x=.s.obj): $(gen_files_krb5:.x=.c) $(OBJ)\asn1_krb5_asn1.s.obj: $(OBJ)\asn1_krb5_asn1.c
$(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $** $(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $**
$(gen_files_ocsp:.x=.s.obj): $(gen_files_ocsp:.x=.c) $(OBJ)\asn1_ocsp_asn1.s.obj: $(OBJ)\asn1_ocsp_asn1.c
$(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $** $(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $**
$(gen_files_pkinit:.x=.s.obj): $(gen_files_pkinit:.x=.c) $(OBJ)\asn1_pkinit_asn1.s.obj: $(OBJ)\asn1_pkinit_asn1.c
$(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $** $(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $**
$(gen_files_pkcs8:.x=.s.obj): $(gen_files_pkcs8:.x=.c) $(OBJ)\asn1_pkcs8_asn1.s.obj: $(OBJ)\asn1_pkcs8_asn1.c
$(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $** $(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $**
$(gen_files_pkcs9:.x=.s.obj): $(gen_files_pkcs9:.x=.c) $(OBJ)\asn1_pkcs9_asn1.s.obj: $(OBJ)\asn1_pkcs9_asn1.c
$(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $** $(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $**
$(gen_files_pkcs10:.x=.s.obj): $(gen_files_pkcs10:.x=.c) $(OBJ)\asn1_pkcs10_asn1.s.obj: $(OBJ)\asn1_pkcs10_asn1.c
$(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $** $(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $**
$(gen_files_pkcs12:.x=.s.obj): $(gen_files_pkcs12:.x=.c) $(OBJ)\asn1_pkcs12_asn1.s.obj: $(OBJ)\asn1_pkcs12_asn1.c
$(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $** $(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $**
$(gen_files_digest:.x=.s.obj): $(gen_files_digest:.x=.c) $(OBJ)\asn1_digest_asn1.s.obj: $(OBJ)\asn1_digest_asn1.c
$(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $** $(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $**
$(gen_files_kx509:.x=.s.obj): $(gen_files_kx509:.x=.c) $(OBJ)\asn1_kx509_asn1.s.obj: $(OBJ)\asn1_kx509_asn1.c
$(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $** $(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $**
$(gen_files_x690sample:.x=.s.obj): $(gen_files_x690sample:.x=.c) $(OBJ)\asn1_x690sample_asn1.s.obj: $(OBJ)\asn1_x690sample_asn1.c
$(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $**
$(OBJ)\asn1_test_asn1.s.obj: $(OBJ)\asn1_test_asn1.c
$(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $**
$(OBJ)\asn1_test_template_asn1.s.obj: $(OBJ)\asn1_test_template_asn1.c
$(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $** $(C2OBJ_C_MT) -Fo$@ -Fd$(@D)\ $**
$(OBJ)\asn1_err.s.obj: $(OBJ)\asn1_err.c $(OBJ)\asn1_err.s.obj: $(OBJ)\asn1_err.c
@@ -304,39 +278,7 @@ $(**: =
) )
<< <<
$(gen_files_krb5:.x=.c) : $$(@R).x $(OBJ)\asn1_krb5_asn1.c $(OBJ)\krb5_asn1.h: $(BINDIR)\asn1_compile.exe krb5.asn1 krb5.opt
$(gen_files_ocsp:.x=.c) : $$(@R).x
$(gen_files_pkinit:.x=.c) : $$(@R).x
$(gen_files_pkcs8:.x=.c) : $$(@R).x
$(gen_files_pkcs9:.x=.c) : $$(@R).x
$(gen_files_pkcs10:.x=.c) : $$(@R).x
$(gen_files_pkcs12:.x=.c) : $$(@R).x
$(gen_files_digest:.x=.c) : $$(@R).x
$(gen_files_kx509:.x=.c) : $$(@R).x
$(gen_files_rfc2459:.x=.c) : $$(@R).x
$(gen_files_rfc4108:.x=.c) : $$(@R).x
$(gen_files_cms:.x=.c) : $$(@R).x
$(gen_files_crmf:.x=.c) : $$(@R).x
$(gen_files_x690sample:.x=.c) : $$(@R).x
$(gen_files_test:.x=.c) : $$(@R).x
$(gen_files_test_template:.x=.c) : $$(@R).x
$(gen_files_krb5) $(OBJ)\krb5_asn1.hx: $(BINDIR)\asn1_compile.exe krb5.asn1 krb5.opt
cd $(OBJ) cd $(OBJ)
$(BINDIR)\asn1_compile.exe \ $(BINDIR)\asn1_compile.exe \
--template \ --template \
@@ -346,7 +288,7 @@ $(gen_files_krb5) $(OBJ)\krb5_asn1.hx: $(BINDIR)\asn1_compile.exe krb5.asn1 krb5
|| ($(RM) $(OBJ)\krb5_asn1.h ; exit /b 1) || ($(RM) $(OBJ)\krb5_asn1.h ; exit /b 1)
cd $(SRCDIR) cd $(SRCDIR)
$(gen_files_ocsp) $(OBJ)\ocsp_asn1.hx: $(BINDIR)\asn1_compile.exe ocsp.asn1 $(OBJ)\asn1_ocsp_asn1.c $(OBJ)\ocsp_asn1.h: $(BINDIR)\asn1_compile.exe ocsp.asn1
cd $(OBJ) cd $(OBJ)
$(BINDIR)\asn1_compile.exe \ $(BINDIR)\asn1_compile.exe \
--template \ --template \
@@ -357,25 +299,25 @@ $(gen_files_ocsp) $(OBJ)\ocsp_asn1.hx: $(BINDIR)\asn1_compile.exe ocsp.asn1
|| ($(RM) $(OBJ)\ocsp_asn1.h ; exit /b 1) || ($(RM) $(OBJ)\ocsp_asn1.h ; exit /b 1)
cd $(SRCDIR) cd $(SRCDIR)
$(gen_files_pkinit) $(OBJ)\pkinit_asn1.hx: $(BINDIR)\asn1_compile.exe pkinit.asn1 $(OBJ)\asn1_pkinit_asn1.c $(OBJ)\pkinit_asn1.h: $(BINDIR)\asn1_compile.exe pkinit.asn1
cd $(OBJ) cd $(OBJ)
$(BINDIR)\asn1_compile.exe --template --one-code-file $(SRCDIR)\pkinit.asn1 pkinit_asn1 \ $(BINDIR)\asn1_compile.exe --template --one-code-file $(SRCDIR)\pkinit.asn1 pkinit_asn1 \
|| ($(RM) $(OBJ)\pkinit_asn1.h ; exit /b 1) || ($(RM) $(OBJ)\pkinit_asn1.h ; exit /b 1)
cd $(SRCDIR) cd $(SRCDIR)
$(gen_files_pkcs8) $(OBJ)\pkcs8_asn1.hx: $(BINDIR)\asn1_compile.exe pkcs8.asn1 $(OBJ)\asn1_pkcs8_asn1.c $(OBJ)\pkcs8_asn1.h: $(BINDIR)\asn1_compile.exe pkcs8.asn1
cd $(OBJ) cd $(OBJ)
$(BINDIR)\asn1_compile.exe --template --one-code-file $(SRCDIR)\pkcs8.asn1 pkcs8_asn1 \ $(BINDIR)\asn1_compile.exe --template --one-code-file $(SRCDIR)\pkcs8.asn1 pkcs8_asn1 \
|| ($(RM) $(OBJ)\pkcs8_asn1.h ; exit /b 1) || ($(RM) $(OBJ)\pkcs8_asn1.h ; exit /b 1)
cd $(SRCDIR) cd $(SRCDIR)
$(gen_files_pkcs9) $(OBJ)\pkcs9_asn1.hx: $(BINDIR)\asn1_compile.exe pkcs9.asn1 $(OBJ)\asn1_pkcs9_asn1.c $(OBJ)\pkcs9_asn1.h: $(BINDIR)\asn1_compile.exe pkcs9.asn1
cd $(OBJ) cd $(OBJ)
$(BINDIR)\asn1_compile.exe --template --one-code-file $(SRCDIR)\pkcs9.asn1 pkcs9_asn1 \ $(BINDIR)\asn1_compile.exe --template --one-code-file $(SRCDIR)\pkcs9.asn1 pkcs9_asn1 \
|| ($(RM) $(OBJ)\pkcs9_asn1.h ; exit /b 1) || ($(RM) $(OBJ)\pkcs9_asn1.h ; exit /b 1)
cd $(SRCDIR) cd $(SRCDIR)
$(gen_files_pkcs10) $(OBJ)\pkcs10_asn1.hx: $(BINDIR)\asn1_compile.exe pkcs10.asn1 $(OBJ)\asn1_pkcs10_asn1.c $(OBJ)\pkcs10_asn1.h: $(BINDIR)\asn1_compile.exe pkcs10.asn1
cd $(OBJ) cd $(OBJ)
$(BINDIR)\asn1_compile.exe \ $(BINDIR)\asn1_compile.exe \
--template \ --template \
@@ -386,25 +328,25 @@ $(gen_files_pkcs10) $(OBJ)\pkcs10_asn1.hx: $(BINDIR)\asn1_compile.exe pkcs10.asn
|| ($(RM) $(OBJ)\pkcs10_asn1.h ; exit /b 1) || ($(RM) $(OBJ)\pkcs10_asn1.h ; exit /b 1)
cd $(SRCDIR) cd $(SRCDIR)
$(gen_files_pkcs12) $(OBJ)\pkcs12_asn1.hx: $(BINDIR)\asn1_compile.exe pkcs12.asn1 $(OBJ)\asn1_pkcs12_asn1.c $(OBJ)\pkcs12_asn1.h: $(BINDIR)\asn1_compile.exe pkcs12.asn1
cd $(OBJ) cd $(OBJ)
$(BINDIR)\asn1_compile.exe --template --one-code-file $(SRCDIR)\pkcs12.asn1 pkcs12_asn1 \ $(BINDIR)\asn1_compile.exe --template --one-code-file $(SRCDIR)\pkcs12.asn1 pkcs12_asn1 \
|| ($(RM) $(OBJ)\pkcs12_asn1.h ; exit /b 1) || ($(RM) $(OBJ)\pkcs12_asn1.h ; exit /b 1)
cd $(SRCDIR) cd $(SRCDIR)
$(gen_files_digest) $(OBJ)\digest_asn1.hx: $(BINDIR)\asn1_compile.exe digest.asn1 $(OBJ)\asn1_digest_asn1.c $(OBJ)\digest_asn1.h: $(BINDIR)\asn1_compile.exe digest.asn1
cd $(OBJ) cd $(OBJ)
$(BINDIR)\asn1_compile.exe --template --one-code-file $(SRCDIR)\digest.asn1 digest_asn1 \ $(BINDIR)\asn1_compile.exe --template --one-code-file $(SRCDIR)\digest.asn1 digest_asn1 \
|| ($(RM) $(OBJ)\digest_asn1.h ; exit /b 1) || ($(RM) $(OBJ)\digest_asn1.h ; exit /b 1)
cd $(SRCDIR) cd $(SRCDIR)
$(gen_files_kx509) $(OBJ)\kx509_asn1.hx: $(BINDIR)\asn1_compile.exe kx509.asn1 $(OBJ)\asn1_kx509_asn1.c $(OBJ)\kx509_asn1.h: $(BINDIR)\asn1_compile.exe kx509.asn1
cd $(OBJ) cd $(OBJ)
$(BINDIR)\asn1_compile.exe --template --one-code-file $(SRCDIR)\kx509.asn1 kx509_asn1 \ $(BINDIR)\asn1_compile.exe --template --one-code-file $(SRCDIR)\kx509.asn1 kx509_asn1 \
|| ($(RM) $(OBJ)\kx509_asn1.h ; exit /b 1) || ($(RM) $(OBJ)\kx509_asn1.h ; exit /b 1)
cd $(SRCDIR) cd $(SRCDIR)
$(gen_files_rfc2459) $(OBJ)\rfc2459_asn1.hx: $(BINDIR)\asn1_compile.exe rfc2459.asn1 $(OBJ)\asn1_rfc2459_asn1.c $(OBJ)\rfc2459_asn1.h: $(BINDIR)\asn1_compile.exe rfc2459.asn1
cd $(OBJ) cd $(OBJ)
$(BINDIR)\asn1_compile.exe \ $(BINDIR)\asn1_compile.exe \
--template \ --template \
@@ -414,7 +356,7 @@ $(gen_files_rfc2459) $(OBJ)\rfc2459_asn1.hx: $(BINDIR)\asn1_compile.exe rfc2459.
|| ($(RM) $(OBJ)\rfc2459_asn1.h ; exit /b 1) || ($(RM) $(OBJ)\rfc2459_asn1.h ; exit /b 1)
cd $(SRCDIR) cd $(SRCDIR)
$(gen_files_rfc4108) $(OBJ)\rfc4108_asn1.hx: $(BINDIR)\asn1_compile.exe rfc4108.asn1 $(OBJ)\asn1_rfc4108_asn1.c $(OBJ)\rfc4108_asn1.h: $(BINDIR)\asn1_compile.exe rfc4108.asn1
cd $(OBJ) cd $(OBJ)
$(BINDIR)\asn1_compile.exe \ $(BINDIR)\asn1_compile.exe \
--template \ --template \
@@ -423,7 +365,7 @@ $(gen_files_rfc4108) $(OBJ)\rfc4108_asn1.hx: $(BINDIR)\asn1_compile.exe rfc4108.
|| ($(RM) $(OBJ)\rfc4108_asn1.h ; exit /b 1) || ($(RM) $(OBJ)\rfc4108_asn1.h ; exit /b 1)
cd $(SRCDIR) cd $(SRCDIR)
$(gen_files_cms) $(OBJ)\cms_asn1.hx: $(BINDIR)\asn1_compile.exe cms.asn1 cms.opt $(OBJ)\asn1_cms_asn1.c $(OBJ)\cms_asn1.h: $(BINDIR)\asn1_compile.exe cms.asn1 cms.opt
cd $(OBJ) cd $(OBJ)
$(BINDIR)\asn1_compile.exe \ $(BINDIR)\asn1_compile.exe \
--template \ --template \
@@ -432,7 +374,7 @@ $(gen_files_cms) $(OBJ)\cms_asn1.hx: $(BINDIR)\asn1_compile.exe cms.asn1 cms.opt
|| ($(RM) $(OBJ)\cms_asn1.h ; exit /b 1) || ($(RM) $(OBJ)\cms_asn1.h ; exit /b 1)
cd $(SRCDIR) cd $(SRCDIR)
$(gen_files_crmf) $(OBJ)\crmf_asn1.hx: $(BINDIR)\asn1_compile.exe crmf.asn1 crmf.opt $(gen_files_crmf) $(OBJ)\crmf_asn1.h: $(BINDIR)\asn1_compile.exe crmf.asn1 crmf.opt
cd $(OBJ) cd $(OBJ)
$(BINDIR)\asn1_compile.exe \ $(BINDIR)\asn1_compile.exe \
--template \ --template \
@@ -441,7 +383,7 @@ $(gen_files_crmf) $(OBJ)\crmf_asn1.hx: $(BINDIR)\asn1_compile.exe crmf.asn1 crmf
|| ($(RM) $(OBJ)\crmf_asn1.h ; exit /b 1) || ($(RM) $(OBJ)\crmf_asn1.h ; exit /b 1)
cd $(SRCDIR) cd $(SRCDIR)
$(gen_files_x690sample) $(OBJ)\x690sample_asn1.hx: $(BINDIR)\asn1_compile.exe x690sample.asn1 $(OBJ)\asn1_x690sample_asn1.c $(OBJ)\x690sample_asn1.h: $(BINDIR)\asn1_compile.exe x690sample.asn1
cd $(OBJ) cd $(OBJ)
$(BINDIR)\asn1_compile.exe \ $(BINDIR)\asn1_compile.exe \
--template \ --template \
@@ -450,7 +392,7 @@ $(gen_files_x690sample) $(OBJ)\x690sample_asn1.hx: $(BINDIR)\asn1_compile.exe x6
|| ($(RM) $(OBJ)\x690sample_asn1.h ; exit /b 1) || ($(RM) $(OBJ)\x690sample_asn1.h ; exit /b 1)
cd $(SRCDIR) cd $(SRCDIR)
$(gen_files_test) $(OBJ)\test_asn1.hx: $(BINDIR)\asn1_compile.exe test.asn1 $(OBJ)\asn1_test_asn1.c $(OBJ)\test_asn1.h: $(BINDIR)\asn1_compile.exe test.asn1
cd $(OBJ) cd $(OBJ)
$(BINDIR)\asn1_compile.exe \ $(BINDIR)\asn1_compile.exe \
--template \ --template \
@@ -460,7 +402,7 @@ $(gen_files_test) $(OBJ)\test_asn1.hx: $(BINDIR)\asn1_compile.exe test.asn1
|| ($(RM) $(OBJ)\test_asn1.h ; exit /b 1) || ($(RM) $(OBJ)\test_asn1.h ; exit /b 1)
cd $(SRCDIR) cd $(SRCDIR)
$(gen_files_test_template) $(OBJ)\test_template_asn1.hx: $(BINDIR)\asn1_compile.exe test.asn1 $(OBJ)\asn1_test_template_asn1.c $(OBJ)\test_template_asn1.h: $(BINDIR)\asn1_compile.exe test.asn1
cd $(OBJ) cd $(OBJ)
$(BINDIR)\asn1_compile.exe \ $(BINDIR)\asn1_compile.exe \
--template \ --template \
@@ -592,7 +534,7 @@ $(OBJ)\check-der.exe: $(OBJ)\check-der.obj $(OBJ)\check-common.obj \
$(EXEPREP_NODIST) $(EXEPREP_NODIST)
$(OBJ)\check-gen-template.exe: $(OBJ)\check-gen.obj $(OBJ)\check-common.obj \ $(OBJ)\check-gen-template.exe: $(OBJ)\check-gen.obj $(OBJ)\check-common.obj \
$(LIBHEIMDAL) $(LIBROKEN) $(gen_files_test_template:.x=.obj) $(LIBHEIMDAL) $(LIBROKEN) $(OBJ)\asn1_test_template_asn1.obj
$(EXECONLINK) $(EXECONLINK)
$(EXEPREP_NODIST) $(EXEPREP_NODIST)
@@ -602,6 +544,6 @@ $(OBJ)\check-timegm.exe: $(OBJ)\check-timegm.obj \
$(EXEPREP_NODIST) $(EXEPREP_NODIST)
$(OBJ)\check-template.exe: $(OBJ)\check-template.obj $(OBJ)\check-common.obj \ $(OBJ)\check-template.exe: $(OBJ)\check-template.obj $(OBJ)\check-common.obj \
$(LIBHEIMDAL) $(LIBROKEN) $(gen_files_test:.x=.obj) $(LIBHEIMDAL) $(LIBROKEN) $(OBJ)\asn1_test_asn1.obj
$(EXECONLINK) $(EXECONLINK)
$(EXEPREP_NODIST) $(EXEPREP_NODIST)

28
lib/asn1/asn1_print.c
View File

@@ -114,22 +114,22 @@ const struct types {
(releaser)free_ ## gns, \ (releaser)free_ ## gns, \
}, },
#endif #endif
#include "cms_asn1_syms.x" #include "cms_asn1_syms.c"
#include "digest_asn1_syms.x" #include "digest_asn1_syms.c"
#include "krb5_asn1_syms.x" #include "krb5_asn1_syms.c"
#include "kx509_asn1_syms.x" #include "kx509_asn1_syms.c"
#include "ocsp_asn1_syms.x" #include "ocsp_asn1_syms.c"
#include "pkcs10_asn1_syms.x" #include "pkcs10_asn1_syms.c"
#include "pkcs12_asn1_syms.x" #include "pkcs12_asn1_syms.c"
#include "pkcs8_asn1_syms.x" #include "pkcs8_asn1_syms.c"
#include "pkcs9_asn1_syms.x" #include "pkcs9_asn1_syms.c"
#include "pkinit_asn1_syms.x" #include "pkinit_asn1_syms.c"
#include "rfc2459_asn1_syms.x" #include "rfc2459_asn1_syms.c"
#include "rfc4108_asn1_syms.x" #include "rfc4108_asn1_syms.c"
#ifdef ASN1_PRINT_SUPPORTED #ifdef ASN1_PRINT_SUPPORTED
#include "x690sample_template_asn1_syms.x" #include "x690sample_template_asn1_syms.c"
#else #else
#include "x690sample_asn1_syms.x" #include "x690sample_asn1_syms.c"
#endif #endif
}; };

12
lib/asn1/gen.c
View File

@@ -159,7 +159,7 @@ init_generate (const char *filename, const char *base)
/* public header file */ /* public header file */
if (asprintf(&header, "%s.h", headerbase) < 0 || header == NULL) if (asprintf(&header, "%s.h", headerbase) < 0 || header == NULL)
errx(1, "malloc"); errx(1, "malloc");
if (asprintf(&fn, "%s.hx", headerbase) < 0 || fn == NULL) if (asprintf(&fn, "%s.h", headerbase) < 0 || fn == NULL)
errx(1, "malloc"); errx(1, "malloc");
headerfile = fopen (fn, "w"); headerfile = fopen (fn, "w");
if (headerfile == NULL) if (headerfile == NULL)
@@ -170,7 +170,7 @@ init_generate (const char *filename, const char *base)
/* private header file */ /* private header file */
if (asprintf(&privheader, "%s-priv.h", headerbase) < 0 || privheader == NULL) if (asprintf(&privheader, "%s-priv.h", headerbase) < 0 || privheader == NULL)
errx(1, "malloc"); errx(1, "malloc");
if (asprintf(&fn, "%s-priv.hx", headerbase) < 0 || fn == NULL) if (asprintf(&fn, "%s-priv.h", headerbase) < 0 || fn == NULL)
errx(1, "malloc"); errx(1, "malloc");
privheaderfile = fopen (fn, "w"); privheaderfile = fopen (fn, "w");
if (privheaderfile == NULL) if (privheaderfile == NULL)
@@ -179,7 +179,7 @@ init_generate (const char *filename, const char *base)
fn = NULL; fn = NULL;
/* template file */ /* template file */
if (asprintf(&template, "%s-template.x", headerbase) < 0 || template == NULL) if (asprintf(&template, "%s-template.c", headerbase) < 0 || template == NULL)
errx(1, "malloc"); errx(1, "malloc");
fprintf (headerfile, fprintf (headerfile,
"/* Generated from %s */\n" "/* Generated from %s */\n"
@@ -300,12 +300,12 @@ init_generate (const char *filename, const char *base)
free(fn); free(fn);
fn = NULL; fn = NULL;
if (asprintf(&fn, "%s_oids.x", base) < 0 || fn == NULL) if (asprintf(&fn, "%s_oids.c", base) < 0 || fn == NULL)
errx(1, "malloc"); errx(1, "malloc");
oidsfile = fopen(fn, "w"); oidsfile = fopen(fn, "w");
if (oidsfile == NULL) if (oidsfile == NULL)
err (1, "open %s", fn); err (1, "open %s", fn);
if (asprintf(&fn, "%s_syms.x", base) < 0 || fn == NULL) if (asprintf(&fn, "%s_syms.c", base) < 0 || fn == NULL)
errx(1, "malloc"); errx(1, "malloc");
symsfile = fopen(fn, "w"); symsfile = fopen(fn, "w");
if (symsfile == NULL) if (symsfile == NULL)
@@ -415,7 +415,7 @@ generate_header_of_codefile(const char *name)
if (codefile != NULL) if (codefile != NULL)
abort(); abort();
if (asprintf (&filename, "%s_%s.x", STEM, name) < 0 || filename == NULL) if (asprintf (&filename, "%s_%s.c", STEM, name) < 0 || filename == NULL)
errx(1, "malloc"); errx(1, "malloc");
codefile = fopen (filename, "w"); codefile = fopen (filename, "w");
if (codefile == NULL) if (codefile == NULL)

74
lib/asn1/oid_resolution.c
View File

@@ -59,19 +59,19 @@ struct sym_oid {
{ #sym, &asn1_oid_ ## sym }, { #sym, &asn1_oid_ ## sym },
static const struct sym_oid sym_oids[] = { static const struct sym_oid sym_oids[] = {
#include "cms_asn1_oids.x" #include "cms_asn1_oids.c"
#include "crmf_asn1_oids.x" #include "crmf_asn1_oids.c"
#include "digest_asn1_oids.x" #include "digest_asn1_oids.c"
#include "krb5_asn1_oids.x" #include "krb5_asn1_oids.c"
#include "kx509_asn1_oids.x" #include "kx509_asn1_oids.c"
#include "ocsp_asn1_oids.x" #include "ocsp_asn1_oids.c"
#include "pkcs10_asn1_oids.x" #include "pkcs10_asn1_oids.c"
#include "pkcs12_asn1_oids.x" #include "pkcs12_asn1_oids.c"
#include "pkcs8_asn1_oids.x" #include "pkcs8_asn1_oids.c"
#include "pkcs9_asn1_oids.x" #include "pkcs9_asn1_oids.c"
#include "pkinit_asn1_oids.x" #include "pkinit_asn1_oids.c"
#include "rfc2459_asn1_oids.x" #include "rfc2459_asn1_oids.c"
#include "rfc4108_asn1_oids.x" #include "rfc4108_asn1_oids.c"
}; };
static size_t num_sym_oids = sizeof(sym_oids) / sizeof(sym_oids[0]); static size_t num_sym_oids = sizeof(sym_oids) / sizeof(sym_oids[0]);
@@ -95,18 +95,18 @@ static size_t
count_sym_oids(void) count_sym_oids(void)
{ {
size_t c = 0; size_t c = 0;
#include "cms_asn1_oids.x" #include "cms_asn1_oids.c"
#include "crmf_asn1_oids.x" #include "crmf_asn1_oids.c"
#include "digest_asn1_oids.x" #include "digest_asn1_oids.c"
#include "krb5_asn1_oids.x" #include "krb5_asn1_oids.c"
#include "kx509_asn1_oids.x" #include "kx509_asn1_oids.c"
#include "ocsp_asn1_oids.x" #include "ocsp_asn1_oids.c"
#include "pkcs10_asn1_oids.x" #include "pkcs10_asn1_oids.c"
#include "pkcs12_asn1_oids.x" #include "pkcs12_asn1_oids.c"
#include "pkcs8_asn1_oids.x" #include "pkcs8_asn1_oids.c"
#include "pkcs9_asn1_oids.x" #include "pkcs9_asn1_oids.c"
#include "pkinit_asn1_oids.x" #include "pkinit_asn1_oids.c"
#include "rfc2459_asn1_oids.x" #include "rfc2459_asn1_oids.c"
return c; return c;
} }
#undef DEFINE_OID_WITH_NAME #undef DEFINE_OID_WITH_NAME
@@ -125,18 +125,18 @@ init_sym_oids(void)
if (!sym_oids && if (!sym_oids &&
(c = count_sym_oids()) && (c = count_sym_oids()) &&
(tmp = calloc(c, sizeof(tmp[0])))) { (tmp = calloc(c, sizeof(tmp[0])))) {
#include "cms_asn1_oids.x" #include "cms_asn1_oids.c"
#include "crmf_asn1_oids.x" #include "crmf_asn1_oids.c"
#include "digest_asn1_oids.x" #include "digest_asn1_oids.c"
#include "krb5_asn1_oids.x" #include "krb5_asn1_oids.c"
#include "kx509_asn1_oids.x" #include "kx509_asn1_oids.c"
#include "ocsp_asn1_oids.x" #include "ocsp_asn1_oids.c"
#include "pkcs10_asn1_oids.x" #include "pkcs10_asn1_oids.c"
#include "pkcs12_asn1_oids.x" #include "pkcs12_asn1_oids.c"
#include "pkcs8_asn1_oids.x" #include "pkcs8_asn1_oids.c"
#include "pkcs9_asn1_oids.x" #include "pkcs9_asn1_oids.c"
#include "pkinit_asn1_oids.x" #include "pkinit_asn1_oids.c"
#include "rfc2459_asn1_oids.x" #include "rfc2459_asn1_oids.c"
num_sym_oids = c; num_sym_oids = c;
sym_oids = tmp; sym_oids = tmp;
} }

34
lib/gssapi/Makefile.am
View File

@@ -303,19 +303,19 @@ nobase_include_HEADERS = \
gssapidir = $(includedir)/gssapi gssapidir = $(includedir)/gssapi
nodist_gssapi_HEADERS = gkrb5_err.h negoex_err.h nodist_gssapi_HEADERS = gkrb5_err.h negoex_err.h
gssapi_files = asn1_GSSAPIContextToken.x gssapi_files = asn1_GSSAPIContextToken.c
spnego_files = \ spnego_files = \
asn1_ContextFlags.x \ asn1_ContextFlags.c \
asn1_MechType.x \ asn1_MechType.c \
asn1_MechTypeList.x \ asn1_MechTypeList.c \
asn1_NegotiationToken.x \ asn1_NegotiationToken.c \
asn1_NegotiationToken2.x \ asn1_NegotiationToken2.c \
asn1_NegHints.x \ asn1_NegHints.c \
asn1_NegTokenInit.x \ asn1_NegTokenInit.c \
asn1_NegTokenInit2.x \ asn1_NegTokenInit2.c \
asn1_NegTokenResp.x \ asn1_NegTokenResp.c \
asn1_NegStateEnum.x asn1_NegStateEnum.c
BUILTHEADERS = \ BUILTHEADERS = \
$(srcdir)/krb5/gsskrb5-private.h \ $(srcdir)/krb5/gsskrb5-private.h \
@@ -328,7 +328,7 @@ $(test_context_OBJECTS): $(BUILTHEADERS)
$(libgssapi_la_OBJECTS): $(srcdir)/version-script.map $(libgssapi_la_OBJECTS): $(srcdir)/version-script.map
BUILT_SOURCES = $(spnego_files:.x=.c) $(gssapi_files:.x=.c) BUILT_SOURCES = $(spnego_files) $(gssapi_files)
$(libgssapi_la_OBJECTS): gkrb5_err.h negoex_err.h $(libgssapi_la_OBJECTS): gkrb5_err.h negoex_err.h
gkrb5_err.h: $(srcdir)/krb5/gkrb5_err.et gkrb5_err.h: $(srcdir)/krb5/gkrb5_err.et
@@ -338,10 +338,12 @@ CLEANFILES = $(BUILT_SOURCES) \
gkrb5_err.[ch] negoex_err.[ch] \ gkrb5_err.[ch] negoex_err.[ch] \
$(spnego_files) spnego_asn1*.h* spnego_asn1_files spnego_asn1-template.[cx] \ $(spnego_files) spnego_asn1*.h* spnego_asn1_files spnego_asn1-template.[cx] \
$(gssapi_files) gssapi_asn1*.h* gssapi_asn1_files gssapi_asn1-template.[cx] \ $(gssapi_files) gssapi_asn1*.h* gssapi_asn1_files gssapi_asn1-template.[cx] \
gss-commands.h gss-commands.c gss-commands.h gss-commands.c \
gssapi_asn1.json gssapi_asn1_oids.c gssapi_asn1_syms.c \
spnego_asn1.json spnego_asn1_oids.c spnego_asn1_syms.c
$(spnego_files) spnego_asn1.hx spnego_asn1-priv.hx: spnego_asn1_files $(spnego_files) spnego_asn1.h spnego_asn1-priv.h: spnego_asn1_files
$(gssapi_files) gssapi_asn1.hx gssapi_asn1-priv.hx: gssapi_asn1_files $(gssapi_files) gssapi_asn1.h gssapi_asn1-priv.h: gssapi_asn1_files
spnego_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/spnego/spnego.asn1 $(srcdir)/spnego/spnego.opt spnego_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/spnego/spnego.asn1 $(srcdir)/spnego/spnego.opt
$(ASN1_COMPILE) --option-file=$(srcdir)/spnego/spnego.opt $(srcdir)/spnego/spnego.asn1 spnego_asn1 $(ASN1_COMPILE) --option-file=$(srcdir)/spnego/spnego.opt $(srcdir)/spnego/spnego.asn1 spnego_asn1
@@ -445,7 +447,7 @@ $(srcdir)/gssapi/gssapi_oid.h $(srcdir)/mech/gss_oid.c:
# NegoEx test mechanism, uses decode_GSSAPIContextToken # NegoEx test mechanism, uses decode_GSSAPIContextToken
# #
test_negoex_mech_la_SOURCES = test_negoex_mech.c $(gssapi_files:.x=.c) test_negoex_mech_la_SOURCES = test_negoex_mech.c $(gssapi_files)
test_negoex_mech_la_LDFLAGS = -module test_negoex_mech_la_LDFLAGS = -module
test_negoex_mech_la_LIBADD = \ test_negoex_mech_la_LIBADD = \
$(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/asn1/libasn1.la \

32
lib/gssapi/NTMakefile
View File

@@ -277,22 +277,14 @@ $(OBJ)\spnego\spnego-private.h: $(spnegosrc)
$(OBJ)\sanon\sanon-private.h: $(sanonsrc) $(OBJ)\sanon\sanon-private.h: $(sanonsrc)
$(PERL) ../../cf/make-proto.pl -q -P remove -p $@ $(sanonsrc) $(PERL) ../../cf/make-proto.pl -q -P remove -p $@ $(sanonsrc)
gssapi_files = $(OBJ)\gssapi\asn1_gssapi_asn1.x $(OBJ)\gssapi\asn1_gssapi_asn1.c $(OBJ)\gssapi\gssapi_asn1.h $(OBJ)\gssapi\gssapi_asn1-priv.h: \
spnego_files = $(OBJ)\spnego\asn1_spnego_asn1.x
$(gssapi_files:.x=.c): $$(@R).x
$(spnego_files:.x=.c): $$(@R).x
$(gssapi_files) $(OBJ)\gssapi\gssapi_asn1.hx $(OBJ)\gssapi\gssapi_asn1-priv.hx: \
$(BINDIR)\asn1_compile.exe mech\gssapi.asn1 $(BINDIR)\asn1_compile.exe mech\gssapi.asn1
cd $(OBJ)\gssapi cd $(OBJ)\gssapi
$(BINDIR)\asn1_compile.exe --one-code-file $(SRCDIR)\mech\gssapi.asn1 gssapi_asn1 \ $(BINDIR)\asn1_compile.exe --one-code-file $(SRCDIR)\mech\gssapi.asn1 gssapi_asn1 \
|| ( $(RM) $(OBJ)\gssapi\gssapi_asn1.h ; exit /b 1 ) || ( $(RM) $(OBJ)\gssapi\gssapi_asn1.h ; exit /b 1 )
cd $(SRCDIR) cd $(SRCDIR)
$(spnego_files) $(OBJ)\spnego\spnego_asn1.hx $(OBJ)\spnego\spnego_asn1-priv.hx: \ $(OBJ)\spnego\asn1_spnego_asn1.c $(OBJ)\spnego\spnego_asn1.h $(OBJ)\spnego\spnego_asn1-priv.h: \
$(BINDIR)\asn1_compile.exe spnego\spnego.asn1 $(BINDIR)\asn1_compile.exe spnego\spnego.asn1
cd $(OBJ)\spnego cd $(OBJ)\spnego
$(BINDIR)\asn1_compile --one-code-file --sequence=MechTypeList \ $(BINDIR)\asn1_compile --one-code-file --sequence=MechTypeList \
@@ -541,8 +533,8 @@ libgssapi_OBJs = \
$(OBJ)\sanon/release_name.obj \ $(OBJ)\sanon/release_name.obj \
$(OBJ)\gkrb5_err.obj \ $(OBJ)\gkrb5_err.obj \
$(OBJ)\negoex_err.obj \ $(OBJ)\negoex_err.obj \
$(spnego_files:.x=.obj) \ $(OBJ)\spnego\asn1_spnego_asn1.obj \
$(gssapi_files:.x=.obj) $(OBJ)\gssapi\asn1_gssapi_asn1.obj
GCOPTS=-I$(SRCDIR) -I$(OBJ) -Igssapi -DBUILD_GSSAPI_LIB GCOPTS=-I$(SRCDIR) -I$(OBJ) -Igssapi -DBUILD_GSSAPI_LIB
@@ -582,24 +574,12 @@ GCOPTS=-I$(SRCDIR) -I$(OBJ) -Igssapi -DBUILD_GSSAPI_LIB
{$(OBJ)}.c{$(OBJ)}.obj:: {$(OBJ)}.c{$(OBJ)}.obj::
$(C2OBJ_P) $(GCOPTS) $(C2OBJ_P) $(GCOPTS)
{$(OBJ)\spnego}.x{$(OBJ)\spnego}.c:
$(CP) $** $@
{$(OBJ)\gssapi}.x{$(OBJ)\gssapi}.c:
$(CP) $** $@
{gssapi}.h{$(INCDIR)\gssapi}.h: {gssapi}.h{$(INCDIR)\gssapi}.h:
$(CP) $** $@ $(CP) $** $@
{$(OBJ)}.h{$(INCDIR)\gssapi}.h: {$(OBJ)}.h{$(INCDIR)\gssapi}.h:
$(CP) $** $@ $(CP) $** $@
{$(OBJ)\gssapi}.hx{$(OBJ)\gssapi}.h:
$(CP) $** $@
{$(OBJ)\spnego}.hx{$(OBJ)\spnego}.h:
$(CP) $** $@
LIBGSSAPI_LIBS=\ LIBGSSAPI_LIBS=\
$(LIBHEIMBASE) \ $(LIBHEIMBASE) \
$(LIBROKEN) \ $(LIBROKEN) \
@@ -694,8 +674,8 @@ $(OBJ)\gss-commands.c $(OBJ)\gss-commands.h: gss-commands.in
(generate-obj-macro "libgssapi_OBJs" (generate-obj-macro "libgssapi_OBJs"
(concat "\t$(OBJ)\\gkrb5_err.obj \\\n" (concat "\t$(OBJ)\\gkrb5_err.obj \\\n"
"\t$(OBJ)\\negoex_err.obj \\\n" "\t$(OBJ)\\negoex_err.obj \\\n"
"\t$(spnego_files:.x=.obj) \\\n" "\t$(OBJ)\\spnego\\asn1_spnego_asn1.obj \\\n"
"\t$(gssapi_files:.x=.obj)") "\t$(OBJ)\\gssapi\\asn1_gssapi_asn1.obj")
"krb5src" "mechsrc" "spnegosrc" "ntlmsrc") "krb5src" "mechsrc" "spnegosrc" "ntlmsrc")
!endif !endif

56
lib/hdb/Makefile.am
View File

@@ -13,38 +13,40 @@ AM_CPPFLAGS += -I$(DBHEADER)
endif endif
BUILT_SOURCES = \ BUILT_SOURCES = \
$(gen_files_hdb:.x=.c) \ $(gen_files_hdb) \
hdb_err.c \ hdb_err.c \
hdb_err.h hdb_err.h
gen_files_hdb = \ gen_files_hdb = \
asn1_Salt.x \ asn1_Salt.c \
asn1_Key.x \ asn1_Key.c \
asn1_Event.x \ asn1_Event.c \
asn1_HDBFlags.x \ asn1_HDBFlags.c \
asn1_GENERATION.x \ asn1_GENERATION.c \
asn1_HDB_Ext_PKINIT_acl.x \ asn1_HDB_Ext_PKINIT_acl.c \
asn1_HDB_Ext_PKINIT_cert.x \ asn1_HDB_Ext_PKINIT_cert.c \
asn1_HDB_Ext_PKINIT_hash.x \ asn1_HDB_Ext_PKINIT_hash.c \
asn1_HDB_Ext_Constrained_delegation_acl.x \ asn1_HDB_Ext_Constrained_delegation_acl.c \
asn1_HDB_Ext_KeyRotation.x \ asn1_HDB_Ext_KeyRotation.c \
asn1_HDB_Ext_Lan_Manager_OWF.x \ asn1_HDB_Ext_Lan_Manager_OWF.c \
asn1_HDB_Ext_Password.x \ asn1_HDB_Ext_Password.c \
asn1_HDB_Ext_Aliases.x \ asn1_HDB_Ext_Aliases.c \
asn1_HDB_Ext_KeySet.x \ asn1_HDB_Ext_KeySet.c \
asn1_HDB_extension.x \ asn1_HDB_extension.c \
asn1_HDB_extensions.x \ asn1_HDB_extensions.c \
asn1_HDB_EncTypeList.x \ asn1_HDB_EncTypeList.c \
asn1_HDB_EntryOrAlias.x \ asn1_HDB_EntryOrAlias.c \
asn1_KeyRotation.x \ asn1_KeyRotation.c \
asn1_KeyRotationFlags.x \ asn1_KeyRotationFlags.c \
asn1_HDB_entry.x \ asn1_HDB_entry.c \
asn1_HDB_entry_alias.x \ asn1_HDB_entry_alias.c \
asn1_HDB_keyset.x \ asn1_HDB_keyset.c \
asn1_Keys.x asn1_Keys.c
CLEANFILES = $(BUILT_SOURCES) $(gen_files_hdb) \ CLEANFILES = $(BUILT_SOURCES) $(gen_files_hdb) \
hdb_asn1{,-priv}.h* hdb_asn1_files hdb_asn1-template.[cx] hdb_asn1{,-priv}.h hdb_asn1_files hdb_asn1-template.c \
hdb_asn1_syms.c hdb_asn1_oids.c hdb_asn1.json \
testhdb-*
LDADD = libhdb.la \ LDADD = libhdb.la \
../krb5/libkrb5.la \ ../krb5/libkrb5.la \
@@ -139,7 +141,7 @@ $(srcdir)/hdb-protos.h: $(dist_libhdb_la_SOURCES)
$(srcdir)/hdb-private.h: $(dist_libhdb_la_SOURCES) $(srcdir)/hdb-private.h: $(dist_libhdb_la_SOURCES)
cd $(srcdir); perl ../../cf/make-proto.pl -q -P comment -p hdb-private.h $(dist_libhdb_la_SOURCES) || rm -f hdb-private.h cd $(srcdir); perl ../../cf/make-proto.pl -q -P comment -p hdb-private.h $(dist_libhdb_la_SOURCES) || rm -f hdb-private.h
$(gen_files_hdb) hdb_asn1.hx hdb_asn1-priv.hx: hdb_asn1_files $(gen_files_hdb) hdb_asn1.h hdb_asn1-priv.h: hdb_asn1_files
hdb_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/hdb.asn1 hdb_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/hdb.asn1
$(ASN1_COMPILE) --sequence=HDB-extensions \ $(ASN1_COMPILE) --sequence=HDB-extensions \

8
lib/hdb/NTMakefile
View File

@@ -35,15 +35,11 @@ intcflags=-DASN1_LIB
!include ../../windows/NTMakefile.w32 !include ../../windows/NTMakefile.w32
gen_files_hdb = $(OBJ)\asn1_hdb_asn1.x $(OBJ)\asn1_hdb_asn1.c $(OBJ)\hdb_asn1.h $(OBJ)\hdb_asn1-priv.h: $(BINDIR)\asn1_compile.exe hdb.asn1
$(gen_files_hdb) $(OBJ)\hdb_asn1.hx $(OBJ)\hdb_asn1-priv.hx: $(BINDIR)\asn1_compile.exe hdb.asn1
cd $(OBJ) cd $(OBJ)
$(BINDIR)\asn1_compile.exe --sequence=HDB-extensions --sequence=HDB-Ext-KeyRotation --sequence=HDB-Ext-KeySet --sequence=Keys --one-code-file $(SRCDIR)\hdb.asn1 hdb_asn1 $(BINDIR)\asn1_compile.exe --sequence=HDB-extensions --sequence=HDB-Ext-KeyRotation --sequence=HDB-Ext-KeySet --sequence=Keys --one-code-file $(SRCDIR)\hdb.asn1 hdb_asn1
cd $(SRCDIR) cd $(SRCDIR)
$(gen_files_hdb:.x=.c): $$(@R).x
!ifdef OPENLDAP_MODULE !ifdef OPENLDAP_MODULE
ldap_dll = $(BINDIR)\hdb_ldap.dll ldap_dll = $(BINDIR)\hdb_ldap.dll
@@ -100,7 +96,7 @@ libhdb_OBJs = \
$(OBJ)\mkey.obj \ $(OBJ)\mkey.obj \
$(OBJ)\ndbm.obj \ $(OBJ)\ndbm.obj \
$(OBJ)\print.obj \ $(OBJ)\print.obj \
$(gen_files_hdb:.x=.obj) \ $(OBJ)\asn1_hdb_asn1.obj \
$(OBJ)\hdb_err.obj $(OBJ)\hdb_err.obj
$(OBJ)\hdb_err.c $(OBJ)\hdb_err.h: hdb_err.et $(OBJ)\hdb_err.c $(OBJ)\hdb_err.h: hdb_err.et

2
windows/NTMakefile.w32
View File

@@ -442,7 +442,7 @@ clean::
-$(RM) $(OBJ)\*.* -$(RM) $(OBJ)\*.*
!endif !endif
.SUFFIXES: .c .cpp .hin .h .x .hx .SUFFIXES: .c .cpp .hin .h .hx
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Manifest handling # Manifest handling