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

Abstract out asn1_compile and slc

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-09-16 00:12:13 -07:00
parent 8e8c155c50
commit dc4e8669ea
9 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/Makefile.am
View File

@@ -4,8 +4,6 @@ include $(top_srcdir)/Makefile.am.common
AM_CPPFLAGS += $(INCLUDE_readline) $(INCLUDE_hcrypto) AM_CPPFLAGS += $(INCLUDE_readline) $(INCLUDE_hcrypto)
SLC = $(top_builddir)/lib/sl/slc
man_MANS = ktutil.8 man_MANS = ktutil.8
sbin_PROGRAMS = ktutil sbin_PROGRAMS = ktutil

20
configure.in
View File

@@ -61,6 +61,26 @@ LT_INIT([shared static win32-dll])
AM_CONDITIONAL(ENABLE_SHARED, test "$enable_shared" = "yes") AM_CONDITIONAL(ENABLE_SHARED, test "$enable_shared" = "yes")
rk_VERSIONSCRIPT rk_VERSIONSCRIPT
dnl
dnl Helper bits for cross compiling
dnl
AM_CONDITIONAL(CROSS_COMPILE, test "${cross_compiling}" = yes)
if test "${cross_compiling}" != yes ; then
ASN1_COMPILE="\$(top_builddir)/lib/asn1/asn1_compile\$(EXEEXT)"
SLC="\$(top_builddir)/lib/sl/slc"
else
ASN1_COMPILE="asn1_compile"
SLC="slc"
fi
AC_SUBST([ASN1_COMPILE])
AC_SUBST([SLC])
dnl ---
AC_DEFINE(HEIM_WEAK_CRYPTO, 1, [Define if you want support for weak crypto]) AC_DEFINE(HEIM_WEAK_CRYPTO, 1, [Define if you want support for weak crypto])
rk_TEST_PACKAGE(openldap, rk_TEST_PACKAGE(openldap,

2
kadmin/Makefile.am
View File

@@ -8,8 +8,6 @@ sbin_PROGRAMS = kadmin
libexec_PROGRAMS = kadmind libexec_PROGRAMS = kadmind
SLC = $(top_builddir)/lib/sl/slc
man_MANS = kadmin.8 kadmind.8 man_MANS = kadmin.8 kadmind.8
noinst_PROGRAMS = add_random_users noinst_PROGRAMS = add_random_users

2
kuser/Makefile.am
View File

@@ -15,8 +15,6 @@ man_MANS = \
kgetcred.1 \ kgetcred.1 \
kimpersonate.1 kimpersonate.1
SLC = $(top_builddir)/lib/sl/slc
bin_PROGRAMS = kinit klist kdestroy kgetcred kswitch bin_PROGRAMS = kinit klist kdestroy kgetcred kswitch
libexec_PROGRAMS = kdigest kimpersonate libexec_PROGRAMS = kdigest kimpersonate

20
lib/asn1/Makefile.am
View File

@@ -596,34 +596,34 @@ $(gen_files_cms) cms_asn1.hx: cms_asn1_files
$(gen_files_test) test_asn1.hx: test_asn1_files $(gen_files_test) test_asn1.hx: test_asn1_files
rfc2459_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/rfc2459.asn1 rfc2459_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/rfc2459.asn1
./asn1_compile$(EXEEXT) --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints $(srcdir)/rfc2459.asn1 rfc2459_asn1 || (rm -f rfc2459_asn1_files ; exit 1) $(ASN1_COMPILE) --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints $(srcdir)/rfc2459.asn1 rfc2459_asn1 || (rm -f rfc2459_asn1_files ; exit 1)
cms_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/cms.asn1 $(srcdir)/cms.opt cms_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/cms.asn1 $(srcdir)/cms.opt
./asn1_compile$(EXEEXT) --option-file=$(srcdir)/cms.opt $(srcdir)/cms.asn1 cms_asn1 || (rm -f cms_asn1_files ; exit 1) $(ASN1_COMPILE) --option-file=$(srcdir)/cms.opt $(srcdir)/cms.asn1 cms_asn1 || (rm -f cms_asn1_files ; exit 1)
krb5_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/krb5.asn1 $(srcdir)/krb5.opt krb5_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/krb5.asn1 $(srcdir)/krb5.opt
./asn1_compile$(EXEEXT) --option-file=$(srcdir)/krb5.opt $(srcdir)/krb5.asn1 krb5_asn1 || (rm -f krb5_asn1_files ; exit 1) $(ASN1_COMPILE) --option-file=$(srcdir)/krb5.opt $(srcdir)/krb5.asn1 krb5_asn1 || (rm -f krb5_asn1_files ; exit 1)
pkinit_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkinit.asn1 pkinit_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkinit.asn1
./asn1_compile$(EXEEXT) $(srcdir)/pkinit.asn1 pkinit_asn1 || (rm -f pkinit_asn1_files ; exit 1) $(ASN1_COMPILE) $(srcdir)/pkinit.asn1 pkinit_asn1 || (rm -f pkinit_asn1_files ; exit 1)
pkcs8_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs8.asn1 pkcs8_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs8.asn1
./asn1_compile$(EXEEXT) $(srcdir)/pkcs8.asn1 pkcs8_asn1 || (rm -f pkcs8_asn1_files ; exit 1) $(ASN1_COMPILE) $(srcdir)/pkcs8.asn1 pkcs8_asn1 || (rm -f pkcs8_asn1_files ; exit 1)
pkcs9_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs9.asn1 pkcs9_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs9.asn1
./asn1_compile$(EXEEXT) $(srcdir)/pkcs9.asn1 pkcs9_asn1 || (rm -f pkcs9_asn1_files ; exit 1) $(ASN1_COMPILE) $(srcdir)/pkcs9.asn1 pkcs9_asn1 || (rm -f pkcs9_asn1_files ; exit 1)
pkcs12_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs12.asn1 pkcs12_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs12.asn1
./asn1_compile$(EXEEXT) $(srcdir)/pkcs12.asn1 pkcs12_asn1 || (rm -f pkcs12_asn1_files ; exit 1) $(ASN1_COMPILE) $(srcdir)/pkcs12.asn1 pkcs12_asn1 || (rm -f pkcs12_asn1_files ; exit 1)
digest_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/digest.asn1 digest_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/digest.asn1
./asn1_compile$(EXEEXT) $(srcdir)/digest.asn1 digest_asn1 || (rm -f digest_asn1_files ; exit 1) $(ASN1_COMPILE) $(srcdir)/digest.asn1 digest_asn1 || (rm -f digest_asn1_files ; exit 1)
kx509_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1 kx509_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1
./asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1 kx509_asn1 || (rm -f kx509_asn1_files ; exit 1) $(ASN1_COMPILE) $(srcdir)/kx509.asn1 kx509_asn1 || (rm -f kx509_asn1_files ; exit 1)
test_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1 test_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1
./asn1_compile$(EXEEXT) --sequence=TESTSeqOf $(srcdir)/test.asn1 test_asn1 || (rm -f test_asn1_files ; exit 1) $(ASN1_COMPILE) --sequence=TESTSeqOf $(srcdir)/test.asn1 test_asn1 || (rm -f test_asn1_files ; exit 1)
EXTRA_DIST = \ EXTRA_DIST = \
cms.asn1 \ cms.asn1 \

6
lib/gssapi/Makefile.am
View File

@@ -262,10 +262,10 @@ $(spnego_files) spnego_asn1.hx: spnego_asn1_files
$(gssapi_files) gssapi_asn1.hx: gssapi_asn1_files $(gssapi_files) gssapi_asn1.hx: gssapi_asn1_files
spnego_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/spnego/spnego.asn1 $(srcdir)/spnego/spnego.opt spnego_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/spnego/spnego.asn1 $(srcdir)/spnego/spnego.opt
../asn1/asn1_compile$(EXEEXT) --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
gssapi_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/mech/gssapi.asn1 gssapi_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/mech/gssapi.asn1
../asn1/asn1_compile$(EXEEXT) $(srcdir)/mech/gssapi.asn1 gssapi_asn1 $(ASN1_COMPILE) $(srcdir)/mech/gssapi.asn1 gssapi_asn1
$(srcdir)/krb5/gsskrb5-private.h: $(srcdir)/krb5/gsskrb5-private.h:
cd $(srcdir) && perl ../../cf/make-proto.pl -q -P comment -p krb5/gsskrb5-private.h $(krb5src) || rm -f krb5/gsskrb5-private.h cd $(srcdir) && perl ../../cf/make-proto.pl -q -P comment -p krb5/gsskrb5-private.h $(krb5src) || rm -f krb5/gsskrb5-private.h
@@ -307,8 +307,6 @@ gss_LDADD = libgssapi.la \
$(LIB_readline) \ $(LIB_readline) \
$(LIB_roken) $(LIB_roken)
SLC = $(top_builddir)/lib/sl/slc
gss-commands.c gss-commands.h: gss-commands.in gss-commands.c gss-commands.h: gss-commands.in
$(SLC) $(srcdir)/gss-commands.in $(SLC) $(srcdir)/gss-commands.in

2
lib/hdb/Makefile.am
View File

@@ -109,7 +109,7 @@ $(srcdir)/hdb-private.h:
$(gen_files_hdb) hdb_asn1.h: hdb_asn1_files $(gen_files_hdb) hdb_asn1.h: hdb_asn1_files
hdb_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/hdb.asn1 hdb_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/hdb.asn1
../asn1/asn1_compile$(EXEEXT) $(srcdir)/hdb.asn1 hdb_asn1 $(ASN1_COMPILE) $(srcdir)/hdb.asn1 hdb_asn1
$(libhdb_la_OBJECTS): hdb_asn1.h hdb_err.h $(libhdb_la_OBJECTS): hdb_asn1.h hdb_err.h

16
lib/hx509/Makefile.am
View File

@@ -114,16 +114,14 @@ $(gen_files_ocsp) ocsp_asn1.h: ocsp_asn1_files
$(gen_files_pkcs10) pkcs10_asn1.h: pkcs10_asn1_files $(gen_files_pkcs10) pkcs10_asn1.h: pkcs10_asn1_files
$(gen_files_crmf) crmf_asn1.h: crmf_asn1_files $(gen_files_crmf) crmf_asn1.h: crmf_asn1_files
asn1_compile = ../asn1/asn1_compile$(EXEEXT) ocsp_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/ocsp.asn1
$(ASN1_COMPILE) --preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData $(srcdir)/ocsp.asn1 ocsp_asn1 || (rm -f ocsp_asn1_files ; exit 1)
ocsp_asn1_files: $(asn1_compile) $(srcdir)/ocsp.asn1 pkcs10_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/pkcs10.asn1
$(asn1_compile) --preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData $(srcdir)/ocsp.asn1 ocsp_asn1 || (rm -f ocsp_asn1_files ; exit 1) $(ASN1_COMPILE) --preserve-binary=CertificationRequestInfo $(srcdir)/pkcs10.asn1 pkcs10_asn1 || (rm -f pkcs10_asn1_files ; exit 1)
pkcs10_asn1_files: $(asn1_compile) $(srcdir)/pkcs10.asn1 crmf_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/crmf.asn1
$(asn1_compile) --preserve-binary=CertificationRequestInfo $(srcdir)/pkcs10.asn1 pkcs10_asn1 || (rm -f pkcs10_asn1_files ; exit 1) $(ASN1_COMPILE) $(srcdir)/crmf.asn1 crmf_asn1 || (rm -f crmf_asn1_files ; exit 1)
crmf_asn1_files: $(asn1_compile) $(srcdir)/crmf.asn1
$(asn1_compile) $(srcdir)/crmf.asn1 crmf_asn1 || (rm -f crmf_asn1_files ; exit 1)
$(libhx509_la_OBJECTS): $(srcdir)/hx509-protos.h $(srcdir)/hx509-private.h $(srcdir)/hx_locl.h $(libhx509_la_OBJECTS): $(srcdir)/hx509-protos.h $(srcdir)/hx509-private.h $(srcdir)/hx_locl.h
$(libhx509_la_OBJECTS): ocsp_asn1.h pkcs10_asn1.h $(libhx509_la_OBJECTS): ocsp_asn1.h pkcs10_asn1.h
@@ -137,8 +135,6 @@ $(srcdir)/hx509-private.h:
dist_include_HEADERS = hx509.h hx509-protos.h dist_include_HEADERS = hx509.h hx509-protos.h
nodist_include_HEADERS = hx509_err.h nodist_include_HEADERS = hx509_err.h
SLC = $(top_builddir)/lib/sl/slc
bin_PROGRAMS = hxtool bin_PROGRAMS = hxtool
hxtool-commands.c hxtool-commands.h: hxtool-commands.in $(SLC) hxtool-commands.c hxtool-commands.h: hxtool-commands.in $(SLC)

2
lib/kadm5/Makefile.am
View File

@@ -2,8 +2,6 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
SLC = $(top_builddir)/lib/sl/slc
lib_LTLIBRARIES = libkadm5srv.la libkadm5clnt.la lib_LTLIBRARIES = libkadm5srv.la libkadm5clnt.la
libkadm5srv_la_LDFLAGS = -version-info 8:1:0 libkadm5srv_la_LDFLAGS = -version-info 8:1:0
libkadm5clnt_la_LDFLAGS = -version-info 7:1:0 libkadm5clnt_la_LDFLAGS = -version-info 7:1:0