Fix remaining dependencides for -exp.cnf files.

svn path=/trunk/; revision=52129

diff --git a/asn1/p22/CMakeLists.txt b/asn1/p22/CMakeLists.txt
index 5e47560208a41ef53fc3e1676c15f6c85ae5994c..5d4774f6ff0ae9e1b09a2f06f743a798ba0b8c1b 100644 (file)
--- 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 46402a42a24793a4dc50a5dd237075a661fb5a7b..5ed0bd145427c706aa9f2dcfec1b4db1cf1a19cd 100644 (file)
--- 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 0913dbb595cdc892c20d73f4053be9d5130c8874..6c9ce27b0c0a8b8d78996aacb8473ea386622c07 100644 (file)
--- 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 ab45f9ec35e2ea31da3a0a50aab50897905dd4d6..04bf095011d9bb3250ef8c40cc80fc83803fc87c 100644 (file)
--- 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 a6e6cdf27a1cd801a8728470d91cfceb5efd9104..259917bec128e6877301cbe31a467eae48b81d0c 100644 (file)
--- 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 1d32ade5784b16fa7264fa5f21f610400bc584f9..78348442e178279f6052bcceaf145c0c8db627c3 100644 (file)
--- 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))