aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2013-09-17 20:45:00 +0000
committerJörg Mayer <jmayer@loplof.de>2013-09-17 20:45:00 +0000
commitaf15a51a6bdb1004ed2d1304106b0a8d24987615 (patch)
tree0c7a706755f24cbf54a48d0f2acc883c260aecd8
parent2b44f1449c9f9a3d5aa5f10f083ecdc1e99c621c (diff)
Fix remaining dependencides for -exp.cnf files.
svn path=/trunk/; revision=52129
-rw-r--r--asn1/p22/CMakeLists.txt4
-rw-r--r--asn1/p22/Makefile.common7
-rw-r--r--asn1/p7/CMakeLists.txt4
-rw-r--r--asn1/p7/Makefile.common7
-rw-r--r--asn1/x509ce/CMakeLists.txt4
-rw-r--r--asn1/x509ce/Makefile.common7
6 files changed, 27 insertions, 6 deletions
diff --git a/asn1/p22/CMakeLists.txt b/asn1/p22/CMakeLists.txt
index 5e47560208..5d4774f6ff 100644
--- a/asn1/p22/CMakeLists.txt
+++ b/asn1/p22/CMakeLists.txt
@@ -68,5 +68,9 @@ set( EXTRA_CNF
x509ce-exp.cnf
)
+set( EXPORT_DEPENDS
+ p1-exp.cnf
+)
+
ASN2WRS()
diff --git a/asn1/p22/Makefile.common b/asn1/p22/Makefile.common
index 46402a42a2..5ed0bd1454 100644
--- a/asn1/p22/Makefile.common
+++ b/asn1/p22/Makefile.common
@@ -51,9 +51,9 @@ SRC_FILES = \
$(EXTRA_DIST) \
$(EXT_ASN_FILE_LIST)
-A2W_FLAGS= -b -C
+A2W_FLAGS = -b -C
-EXTRA_CNF= \
+EXTRA_CNF = \
$(builddir)/../acse/acse-exp.cnf \
$(builddir)/../ftam/ftam-exp.cnf \
$(builddir)/../p7/p7-exp.cnf \
@@ -61,6 +61,9 @@ EXTRA_CNF= \
$(builddir)/../x509af/x509af-exp.cnf \
$(builddir)/../x509ce/x509ce-exp.cnf
+EXPORT_DEPENDS = \
+ $(builddir)/../p1/p1-exp.cnf
+
$(builddir)/../acse/acse-exp.cnf:
(cd $(builddir)/../acse && $(MAKE_CNF_EXPORT))
diff --git a/asn1/p7/CMakeLists.txt b/asn1/p7/CMakeLists.txt
index 0913dbb595..6c9ce27b0c 100644
--- a/asn1/p7/CMakeLists.txt
+++ b/asn1/p7/CMakeLists.txt
@@ -59,5 +59,9 @@ set( EXTRA_CNF
rtse-exp.cnf
)
+set( EXPORT_DEPENDS
+ p1-exp.cnf
+)
+
ASN2WRS()
diff --git a/asn1/p7/Makefile.common b/asn1/p7/Makefile.common
index ab45f9ec35..04bf095011 100644
--- a/asn1/p7/Makefile.common
+++ b/asn1/p7/Makefile.common
@@ -46,13 +46,16 @@ SRC_FILES = \
$(EXTRA_DIST) \
$(EXT_ASN_FILE_LIST)
-A2W_FLAGS= -b -L -C
+A2W_FLAGS = -b -L -C
-EXTRA_CNF= \
+EXTRA_CNF = \
$(builddir)/../p1/p1-exp.cnf \
$(builddir)/../ros/ros-exp.cnf \
$(builddir)/../rtse/rtse.cnf
+EXPORT_DEPENDS = \
+ $(builddir)/../p1/p1-exp.cnf
+
$(builddir)/../p1/p1-exp.cnf:
(cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT))
diff --git a/asn1/x509ce/CMakeLists.txt b/asn1/x509ce/CMakeLists.txt
index a6e6cdf27a..259917bec1 100644
--- a/asn1/x509ce/CMakeLists.txt
+++ b/asn1/x509ce/CMakeLists.txt
@@ -58,5 +58,9 @@ set( EXTRA_CNF
x509sat-exp.cnf
)
+set( EXPORT_DEPENDS
+ x509af-exp.cnf
+)
+
ASN2WRS()
diff --git a/asn1/x509ce/Makefile.common b/asn1/x509ce/Makefile.common
index 1d32ade578..78348442e1 100644
--- a/asn1/x509ce/Makefile.common
+++ b/asn1/x509ce/Makefile.common
@@ -43,14 +43,17 @@ SRC_FILES = \
$(EXTRA_DIST) \
$(EXT_ASN_FILE_LIST)
-A2W_FLAGS= -b
+A2W_FLAGS = -b
-EXTRA_CNF= \
+EXTRA_CNF = \
$(builddir)/../p1/p1-exp.cnf \
$(builddir)/../x509af/x509af-exp.cnf \
$(builddir)/../x509if/x509if-exp.cnf \
$(builddir)/../x509sat/x509sat-exp.cnf
+EXPORT_DEPENDS = \
+ $(builddir)/../x509af/x509af-exp.cnf
+
$(builddir)/../p1/p1-exp.cnf:
(cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT))