diff options
author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-09-17 14:45:52 +0000 |
---|---|---|
committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-09-17 14:45:52 +0000 |
commit | a2e86de1608cf5baaadc082e182b5efbb724aed3 (patch) | |
tree | ebedd8e86528f9142d5e2725176d7a7e72a621e0 | |
parent | af96c7bb458955199cdab4321b83b6f15b860ba9 (diff) |
Fix dependency problems (continuation of r52110 and r52112).
svn path=/trunk/; revision=52118
-rw-r--r-- | asn1/pkix1implicit/CMakeLists.txt | 1 | ||||
-rw-r--r-- | asn1/pkix1implicit/Makefile.common | 4 | ||||
-rw-r--r-- | asn1/pkixac/CMakeLists.txt | 1 | ||||
-rw-r--r-- | asn1/pkixac/Makefile.common | 4 |
4 files changed, 10 insertions, 0 deletions
diff --git a/asn1/pkix1implicit/CMakeLists.txt b/asn1/pkix1implicit/CMakeLists.txt index 7b26e6bdbe..8e9c753d57 100644 --- a/asn1/pkix1implicit/CMakeLists.txt +++ b/asn1/pkix1implicit/CMakeLists.txt @@ -47,6 +47,7 @@ set( SRC_FILES set( A2W_FLAGS -b ) set( EXTRA_CNF + x509af-exp.cnf x509ce-exp.cnf ) diff --git a/asn1/pkix1implicit/Makefile.common b/asn1/pkix1implicit/Makefile.common index 240c30b57c..d08add4652 100644 --- a/asn1/pkix1implicit/Makefile.common +++ b/asn1/pkix1implicit/Makefile.common @@ -44,8 +44,12 @@ SRC_FILES = \ A2W_FLAGS= -b EXTRA_CNF= \ + $(builddir)/../x509af/x509af-exp.cnf \ $(builddir)/../x509ce/x509ce-exp.cnf +$(builddir)/../x509af/x509af-exp.cnf: + (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT)) + $(builddir)/../x509ce/x509ce-exp.cnf: (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT)) diff --git a/asn1/pkixac/CMakeLists.txt b/asn1/pkixac/CMakeLists.txt index e440a9497e..fbaf540a13 100644 --- a/asn1/pkixac/CMakeLists.txt +++ b/asn1/pkixac/CMakeLists.txt @@ -49,6 +49,7 @@ set( A2W_FLAGS -b ) set( EXTRA_CNF ../pkix1explicit/pkix1explicit_exp.cnf ../pkix1implicit/pkix1implicit_exp.cnf + x509af-exp.cnf x509ce-exp.cnf ) diff --git a/asn1/pkixac/Makefile.common b/asn1/pkixac/Makefile.common index b6bc99c006..4ddf4acdf9 100644 --- a/asn1/pkixac/Makefile.common +++ b/asn1/pkixac/Makefile.common @@ -45,8 +45,12 @@ A2W_FLAGS= -b EXTRA_CNF= \ $(builddir)/../pkix1explicit/pkix1explicit_exp.cnf \ $(builddir)/../pkix1implicit/pkix1implicit_exp.cnf \ + $(builddir)/../x509af/x509af-exp.cnf \ $(builddir)/../x509ce/x509ce-exp.cnf +$(builddir)/../x509af/x509af-exp.cnf: + (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT)) + $(builddir)/../x509ce/x509ce-exp.cnf: (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT)) |