Add missing dependencies and update syntax of existing ones.

svn path=/trunk/; revision=23143

32 files changed, 283 insertions, 85 deletions

diff --git a/asn1/acp133/Makefile.common b/asn1/acp133/Makefile.common
index 0333518b65..711710b909 100644
--- a/asn1/acp133/Makefile.common
+++ b/asn1/acp133/Makefile.common
@@ -45,5 +45,21 @@ SRC_FILES = \
 
 A2W_FLAGS= -b -e -X -T
 
-EXTRA_CNF=
+EXTRA_CNF= \
+	../x411/x411-exp.cnf \
+	../x509af/x509af-exp.cnf \
+	../x509ce/x509ce-exp.cnf \
+	../x509if/x509if-exp.cnf
+
+../x411/x411-exp.cnf:
+	(cd ../x411 && $(MAKE_CNF_EXPORT))
+
+../x509af/x509af-exp.cnf:
+	(cd ../x509af && $(MAKE_CNF_EXPORT))
+
+../x509ce/x509ce-exp.cnf:
+	(cd ../x509ce && $(MAKE_CNF_EXPORT))
+
+../x509if/x509if-exp.cnf:
+	(cd ../x509if && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/acse/Makefile.common b/asn1/acse/Makefile.common
index eaa5ac2277..0dbf1b76c5 100644
--- a/asn1/acse/Makefile.common
+++ b/asn1/acse/Makefile.common
@@ -45,5 +45,9 @@ SRC_FILES = \
 
 A2W_FLAGS= -b -e
 
-EXTRA_CNF=
+EXTRA_CNF= \
+	../x509if/x509if-exp.cnf
+
+../x509if/x509if-exp.cnf:
+	(cd ../x509if && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/ansi_map/Makefile.common b/asn1/ansi_map/Makefile.common
index a0ab6b6dbf..c2ef3437e8 100644
--- a/asn1/ansi_map/Makefile.common
+++ b/asn1/ansi_map/Makefile.common
@@ -45,5 +45,9 @@ SRC_FILES = \
 
 A2W_FLAGS= -b -e -X -T
 
-EXTRA_CNF=
+EXTRA_CNF= \
+        ../gsmmap/gsm_map-exp.cnf
+
+../gsmmap/gsm_map-exp.cnf:
+	(cd ../gsmmap && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/camel/Makefile.common b/asn1/camel/Makefile.common
index cf7317b1e1..03686d6ca7 100644
--- a/asn1/camel/Makefile.common
+++ b/asn1/camel/Makefile.common
@@ -65,8 +65,8 @@ EXTRA_CNF=../inap/inap-exp.cnf \
 	../gsmmap/gsm_map-exp.cnf
 
 ../gsmmap/gsm_map-exp.cnf:
-	(cd ../gsmmap && $(MAKE) $(MAKEFLAGS))
+	(cd ../gsmmap && $(MAKE_CNF_EXPORT))
 
 ../inap/inap-exp.cnf:
-	(cd ../inap && $(MAKE) $(MAKEFLAGS))
+	(cd ../inap && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/cmip/Makefile.common b/asn1/cmip/Makefile.common
index 25354a6b70..6dd94db80d 100644
--- a/asn1/cmip/Makefile.common
+++ b/asn1/cmip/Makefile.common
@@ -51,5 +51,9 @@ SRC_FILES = \
 
 A2W_FLAGS= -b -e
 
-EXTRA_CNF=
+EXTRA_CNF= \
+	../acse/acse-exp.cnf
+
+../acse/acse-exp.cnf:
+	(cd ../acse && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/cms/Makefile.common b/asn1/cms/Makefile.common
index 0a66da413e..b8360e6b89 100644
--- a/asn1/cms/Makefile.common
+++ b/asn1/cms/Makefile.common
@@ -45,5 +45,13 @@ SRC_FILES = \
 
 A2W_FLAGS= -b -X -T -e
 
-EXTRA_CNF=
+EXTRA_CNF= \
+	../x509af/x509af-exp.cnf \
+	../x509if/x509if-exp.cnf
+
+../x509af/x509af-exp.cnf:
+	(cd ../x509af && $(MAKE_CNF_EXPORT))
+
+../x509if/x509if-exp.cnf:
+	(cd ../x509if && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/dap/Makefile.common b/asn1/dap/Makefile.common
index a0a99238e1..1aa2ba38c2 100644
--- a/asn1/dap/Makefile.common
+++ b/asn1/dap/Makefile.common
@@ -47,36 +47,36 @@ SRC_FILES = \
 A2W_FLAGS= -b -e
 
 EXTRA_CNF= \
-	../x509if/x509if-exp.cnf \
-	../x509af/x509af-exp.cnf \
-	../x509sat/x509sat-exp.cnf \
-	../pkixcrmf/crmf-exp.cnf \
-	../dsp/dsp-exp.cnf \
+	../acse/acse-exp.cnf \
 	../disp/disp-exp.cnf \
+	../dsp/dsp-exp.cnf \
+	../pkixcrmf/crmf-exp.cnf \
 	../ros/ros-exp.cnf \
-	../acse/acse-exp.cnf
-
-../x509if/x509if-exp.cnf:
-	(cd ../x509if && $(MAKE) $(MAKEFLAGS))
-
-../x509af/x509af-exp.cnf:
-	(cd ../x509af && $(MAKE) $(MAKEFLAGS))
-
-../x509sat/x509sat-exp.cnf:
-	(cd ../x509sat && $(MAKE) $(MAKEFLAGS))
+	../x509af/x509af-exp.cnf \
+	../x509if/x509if-exp.cnf \
+	../x509sat/x509sat-exp.cnf
 
-../pkixcrmf/pkixcrmf-exp.cnf:
-	(cd ../pkixcrmf && $(MAKE) $(MAKEFLAGS))
+../acse/acse-exp.cnf:
+	(cd ../acse && $(MAKE_CNF_EXPORT))
 
 ../disp/disp-exp.cnf:
-	(cd ../disp && $(MAKE) $(MAKEFLAGS))
+	(cd ../disp && $(MAKE_CNF_EXPORT))
 
 ../dsp/dsp-exp.cnf:
-	(cd ../dsp && $(MAKE) $(MAKEFLAGS))
+	(cd ../dsp && $(MAKE_CNF_EXPORT))
+
+../pkixcrmf/crmf-exp.cnf:
+	(cd ../pkixcrmf && $(MAKE_CNF_EXPORT))
 
 ../ros/ros-exp.cnf:
-	(cd ../ros && $(MAKE) $(MAKEFLAGS))
+	(cd ../ros && $(MAKE_CNF_EXPORT))
 
-../acse/asce-exp.cnf:
-	(cd ../asce && $(MAKE) $(MAKEFLAGS))
+../x509af/x509af-exp.cnf:
+	(cd ../x509af && $(MAKE_CNF_EXPORT))
+
+../x509if/x509if-exp.cnf:
+	(cd ../x509if && $(MAKE_CNF_EXPORT))
+
+../x509sat/x509sat-exp.cnf:
+	(cd ../x509sat && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/disp/Makefile.common b/asn1/disp/Makefile.common
index c5003ba396..2f7ed33736 100644
--- a/asn1/disp/Makefile.common
+++ b/asn1/disp/Makefile.common
@@ -46,29 +46,28 @@ SRC_FILES = \
 A2W_FLAGS= -b -e
 
 EXTRA_CNF= \
-	../x509if/x509if-exp.cnf \
-	../x509af/x509af-exp.cnf \
+	../acse/acse-exp.cnf \
 	../dap/dap-exp.cnf \
-	../dsp/dsp-exp.cnf \
 	../dop/dop-exp.cnf \
-	../acse/acse-exp.cnf
-
-../x509if/x509if-exp.cnf:
-	(cd x509if && $(MAKE) $(MAKEFLAGS))
+	../dsp/dsp-exp.cnf \
+	../x509af/x509af-exp.cnf \
+	../x509if/x509if-exp.cnf
 
-../x509af/x509af-exp.cnf:
-	(cd x509af && $(MAKE) $(MAKEFLAGS))
+../acse/acse-exp.cnf:
+	(cd ../acse && $(MAKE_CNF_EXPORT))
 
 ../dap/dap-exp.cnf:
-	(cd dap && $(MAKE) $(MAKEFLAGS))
-
-../dsp/dsp-exp.cnf:
-	(cd dsp && $(MAKE) $(MAKEFLAGS))
+	(cd ../dap && $(MAKE_CNF_EXPORT))
 
 ../dop/dop-exp.cnf:
-	(cd dop && $(MAKE) $(MAKEFLAGS))
+	(cd ../dop && $(MAKE_CNF_EXPORT))
 
-../acse/acse-exp.cnf:
-	(cd acse && $(MAKE) $(MAKEFLAGS))
+../dsp/dsp-exp.cnf:
+	(cd ../dsp && $(MAKE_CNF_EXPORT))
 
+../x509af/x509af-exp.cnf:
+	(cd ../x509af && $(MAKE_CNF_EXPORT))
+
+../x509if/x509if-exp.cnf:
+	(cd ../x509if && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/dop/Makefile.common b/asn1/dop/Makefile.common
index 60b224bb3b..9abfa09d3c 100644
--- a/asn1/dop/Makefile.common
+++ b/asn1/dop/Makefile.common
@@ -45,5 +45,33 @@ SRC_FILES = \
 
 A2W_FLAGS= -b -X -T -e
 
-EXTRA_CNF=
+EXTRA_CNF= \
+        ../acse/acse-exp.cnf \
+        ../dap/dap-exp.cnf \
+        ../dsp/dsp-exp.cnf \
+        ../pkixcrmf/crmf-exp.cnf \
+        ../x509af/x509af-exp.cnf \
+        ../x509if/x509if-exp.cnf \
+        ../x509sat/x509sat-exp.cnf
+
+../acse/acse-exp.cnf:
+	(cd ../acse && $(MAKE_CNF_EXPORT))
+
+../dap/dap-exp.cnf:
+	(cd ../dap && $(MAKE_CNF_EXPORT))
+
+../dsp/dsp-exp.cnf:
+	(cd ../dsp && $(MAKE_CNF_EXPORT))
+
+../pkixcrmf/crmf-exp.cnf:
+	(cd ../pkixcrmf && $(MAKE_CNF_EXPORT))
+
+../x509af/x509af-exp.cnf:
+	(cd ../x509af && $(MAKE_CNF_EXPORT))
+
+../x509if/x509if-exp.cnf:
+	(cd ../x509if && $(MAKE_CNF_EXPORT))
+
+../x509sat/x509sat-exp.cnf:
+	(cd ../x509sat && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/dsp/Makefile.common b/asn1/dsp/Makefile.common
index 33538c0e69..60e4807c9a 100644
--- a/asn1/dsp/Makefile.common
+++ b/asn1/dsp/Makefile.common
@@ -46,25 +46,24 @@ SRC_FILES = \
 A2W_FLAGS= -b -e
 
 EXTRA_CNF = \
+	../acse/acse-exp.cnf \
 	../dap/dap-exp.cnf \
-	../x509if/x509if-exp.cnf \
 	../x509af/x509af-exp.cnf \
-	../x509sat/x509sat-exp.cnf \
-	../acse/acse-exp.cnf
+	../x509if/x509if-exp.cnf \
+	../x509sat/x509sat-exp.cnf
 
+../acse/acse-exp.cnf:
+	(cd ../acse && $(MAKE_CNF_EXPORT))
 
 ../dap/dap-exp.cnf:
-	(cd ../dap && $(MAKE) $(MAKEFLAGS))
-
-../x509if/x509if-exp.cnf:
-	(cd ../x509if && $(MAKE) $(MAKEFLAGS))
+	(cd ../dap && $(MAKE_CNF_EXPORT))
 
 ../x509af/x509af-exp.cnf:
-	(cd ../x509af && $(MAKE) $(MAKEFLAGS))
+	(cd ../x509af && $(MAKE_CNF_EXPORT))
 
-../x509sat/x509sat-exp.cnf:
-	(cd ../x509sat && $(MAKE) $(MAKEFLAGS))
+../x509if/x509if-exp.cnf:
+	(cd ../x509if && $(MAKE_CNF_EXPORT))
 
-../acse/acse-exp.cnf:
-	(cd ../acse && $(MAKE) $(MAKEFLAGS))
+../x509sat/x509sat-exp.cnf:
+	(cd ../x509sat && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/ess/Makefile.common b/asn1/ess/Makefile.common
index 9ff4d8357b..b319be16b6 100644
--- a/asn1/ess/Makefile.common
+++ b/asn1/ess/Makefile.common
@@ -45,5 +45,17 @@ SRC_FILES = \
 
 A2W_FLAGS= -b -k -e
 
-EXTRA_CNF=
+EXTRA_CNF= \
+	../cms/cms-exp.cnf \
+	../x509af/x509af-exp.cnf \
+	../x509ce/x509ce-exp.cnf
+
+../cms/cms-exp.cnf:
+	(cd ../cms && $(MAKE_CNF_EXPORT))
+
+../x509af/x509af-exp.cnf:
+	(cd ../x509af && $(MAKE_CNF_EXPORT))
+
+../x509ce/x509ce-exp.cnf:
+	(cd ../x509ce && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/ftam/Makefile.common b/asn1/ftam/Makefile.common
index 15488f53de..23d1c67a21 100644
--- a/asn1/ftam/Makefile.common
+++ b/asn1/ftam/Makefile.common
@@ -45,5 +45,9 @@ SRC_FILES = \
 
 A2W_FLAGS= -b -X -T -e
 
-EXTRA_CNF=
+EXTRA_CNF= \
+	../acse/acse-exp.cnf
+
+../acse/acse-exp.cnf:
+	(cd ../acse && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/gnm/Makefile.common b/asn1/gnm/Makefile.common
index 5dbd9ae7f0..f8ce2812ac 100644
--- a/asn1/gnm/Makefile.common
+++ b/asn1/gnm/Makefile.common
@@ -45,5 +45,9 @@ SRC_FILES = \
 
 A2W_FLAGS= -b -e -X -T
 
-EXTRA_CNF=
+EXTRA_CNF= \
+	../cmip/cmip-exp.cnf
+
+../cmip/cmip-exp.cnf:
+	(cd ../cmip && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/logotype-cert-extn/Makefile.common b/asn1/logotype-cert-extn/Makefile.common
index 9f93648572..60da8c57af 100644
--- a/asn1/logotype-cert-extn/Makefile.common
+++ b/asn1/logotype-cert-extn/Makefile.common
@@ -46,5 +46,9 @@ SRC_FILES = \
 
 A2W_FLAGS= -b -e
 
-EXTRA_CNF=
+EXTRA_CNF= \
+	../x509af/x509af-exp.cnf
+
+../x509af/x509af-exp.cnf:
+	(cd ../x509af && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/mms/Makefile.common b/asn1/mms/Makefile.common
index 1ec919acbc..26cf706b56 100644
--- a/asn1/mms/Makefile.common
+++ b/asn1/mms/Makefile.common
@@ -45,5 +45,9 @@ SRC_FILES = \
 
 A2W_FLAGS= -b -X -T -e
 
-EXTRA_CNF=
+EXTRA_CNF= \
+	../acse/acse-exp.cnf
+
+../acse/acse-exp.cnf:
+	(cd ../acse && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/ocsp/Makefile.common b/asn1/ocsp/Makefile.common
index 4984374570..6728606477 100644
--- a/asn1/ocsp/Makefile.common
+++ b/asn1/ocsp/Makefile.common
@@ -45,5 +45,13 @@ SRC_FILES = \
 
 A2W_FLAGS= -b -e
 
-EXTRA_CNF=
+EXTRA_CNF= \
+	../x509af/x509af-exp.cnf \
+	../x509ce/x509ce-exp.cnf
+
+../x509af/x509af-exp.cnf:
+	(cd ../x509af && $(MAKE_CNF_EXPORT))
+
+../x509ce/x509ce-exp.cnf:
+	(cd ../x509ce && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/pkcs1/Makefile.common b/asn1/pkcs1/Makefile.common
index 051215792c..2c0f8d575b 100644
--- a/asn1/pkcs1/Makefile.common
+++ b/asn1/pkcs1/Makefile.common
@@ -45,5 +45,9 @@ SRC_FILES = \
 
 A2W_FLAGS= -b
 
-EXTRA_CNF=
+EXTRA_CNF= \
+	../x509af/x509af-exp.cnf
+
+../x509af/x509af-exp.cnf:
+	(cd ../x509af && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/pkcs12/Makefile.common b/asn1/pkcs12/Makefile.common
index 5f02ae68da..e8b67f64ac 100644
--- a/asn1/pkcs12/Makefile.common
+++ b/asn1/pkcs12/Makefile.common
@@ -51,11 +51,11 @@ EXTRA_CNF= \
 	../x509af/x509af-exp.cnf
 
 ../cms/cms-exp.cnf:
-	(cd ../cms && $(MAKE) $(MAKEFLAGS))
-
-../x509if/x509if-exp.cnf:
-	(cd ../x509if && $(MAKE) $(MAKEFLAGS))
+	(cd ../cms && $(MAKE_CNF_EXPORT))
 
 ../x509af/x509af-exp.cnf:
-	(cd ../x509af && $(MAKE) $(MAKEFLAGS))
+	(cd ../x509af && $(MAKE_CNF_EXPORT))
+
+../x509if/x509if-exp.cnf:
+	(cd ../x509if && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/pkinit/Makefile.common b/asn1/pkinit/Makefile.common
index 975c63af7c..d3855a656a 100644
--- a/asn1/pkinit/Makefile.common
+++ b/asn1/pkinit/Makefile.common
@@ -45,5 +45,9 @@ SRC_FILES = \
 
 A2W_FLAGS= -b -e
 
-EXTRA_CNF=
+EXTRA_CNF= \
+	../cms/cms-exp.cnf
+
+../cms/cms-exp.cnf:
+	(cd ../cms && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/pkix1implicit/Makefile.common b/asn1/pkix1implicit/Makefile.common
index 9b75814136..af5e3dd3ce 100644
--- a/asn1/pkix1implicit/Makefile.common
+++ b/asn1/pkix1implicit/Makefile.common
@@ -46,5 +46,9 @@ SRC_FILES = \
 
 A2W_FLAGS= -e -b
 
-EXTRA_CNF=
+EXTRA_CNF= \
+	../x509ce/x509ce-exp.cnf
+
+../x509ce/x509ce-exp.cnf:
+	(cd ../x509ce && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/pkixcmp/Makefile.common b/asn1/pkixcmp/Makefile.common
index 891b036922..ca499da63c 100644
--- a/asn1/pkixcmp/Makefile.common
+++ b/asn1/pkixcmp/Makefile.common
@@ -51,5 +51,5 @@ EXTRA_CNF= \
 	../pkixcrmf/crmf-exp.cnf
 
 ../pkixcrmf/crmf-exp.cnf:
-	(cd ../pkixcrmf && $(MAKE) $(MAKEFLAGS))
+	(cd ../pkixcrmf && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/pkixcrmf/Makefile.common b/asn1/pkixcrmf/Makefile.common
index ec502f6568..5ec642b864 100644
--- a/asn1/pkixcrmf/Makefile.common
+++ b/asn1/pkixcrmf/Makefile.common
@@ -45,5 +45,9 @@ SRC_FILES = \
 
 A2W_FLAGS= -b -e
 
-EXTRA_CNF=
+EXTRA_CNF= \
+	../cms/cms-exp.cnf
+
+../cms/cms-exp.cnf:
+	(cd ../cms && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/pkixqualified/Makefile.common b/asn1/pkixqualified/Makefile.common
index da7244ea90..6ede57b745 100644
--- a/asn1/pkixqualified/Makefile.common
+++ b/asn1/pkixqualified/Makefile.common
@@ -45,5 +45,17 @@ SRC_FILES = \
 
 A2W_FLAGS= -b -e
 
-EXTRA_CNF=
+EXTRA_CNF= \
+	 ../x509af/x509af-exp.cnf \
+	 ../x509ce/x509ce-exp.cnf \
+	 ../x509sat/x509sat-exp.cnf
+
+../x509af/x509af-exp.cnf:
+	(cd ../x509af && $(MAKE_CNF_EXPORT))
+
+../x509ce/x509ce-exp.cnf:
+	(cd ../x509ce && $(MAKE_CNF_EXPORT))
+
+../x509sat/x509sat-exp.cnf:
+	(cd ../x509sat && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/pkixtsp/Makefile.common b/asn1/pkixtsp/Makefile.common
index 67a392fd06..7517227334 100644
--- a/asn1/pkixtsp/Makefile.common
+++ b/asn1/pkixtsp/Makefile.common
@@ -45,5 +45,9 @@ SRC_FILES = \
 
 A2W_FLAGS= -b -e
 
-EXTRA_CNF=
+EXTRA_CNF= \
+	../cms/cms-exp.cnf
+
+../cms/cms-exp.cnf:
+	(cd ../cms && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/pres/Makefile.common b/asn1/pres/Makefile.common
index 02b80790cb..922a673519 100644
--- a/asn1/pres/Makefile.common
+++ b/asn1/pres/Makefile.common
@@ -45,5 +45,9 @@ SRC_FILES = \
 
 A2W_FLAGS= -b -e
 
-EXTRA_CNF=
+EXTRA_CNF= \
+	../rtse/rtse-exp.cnf
+
+../rtse/rtse-exp.cnf:
+	(cd ../rtse && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/s4406/Makefile.common b/asn1/s4406/Makefile.common
index 784572b65f..11f5f00a74 100644
--- a/asn1/s4406/Makefile.common
+++ b/asn1/s4406/Makefile.common
@@ -45,5 +45,13 @@ SRC_FILES = \
 
 A2W_FLAGS= -b -e
 
-EXTRA_CNF=
+EXTRA_CNF= \
+	../x411/x411-exp.cnf \
+	../x420/x420-exp.cnf
+
+../x411/x411-exp.cnf:
+	(cd ../x411 && $(MAKE_CNF_EXPORT))
+
+../x420/x420-exp.cnf:
+	(cd ../x420 && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/x411/Makefile.common b/asn1/x411/Makefile.common
index a4f4805f97..3b47231a1e 100644
--- a/asn1/x411/Makefile.common
+++ b/asn1/x411/Makefile.common
@@ -47,9 +47,23 @@ A2W_FLAGS= -b -e
 
 EXTRA_CNF= \
 	../acse/acse-exp.cnf \
+	../x509af/x509af-exp.cnf \
 	../x509ce/x509ce-exp.cnf \
 	../x509if/x509if-exp.cnf \
-	../x509sat/x509sat-exp.cnf \
-	../x509af/x509af-exp.cnf
+	../x509sat/x509sat-exp.cnf
 
+../acse/acse-exp.cnf:
+	(cd ../acse && $(MAKE_CNF_EXPORT))
+
+../x509af/x509af-exp.cnf:
+	(cd ../x509af && $(MAKE_CNF_EXPORT))
+
+../x509ce/x509ce-exp.cnf:
+	(cd ../x509ce && $(MAKE_CNF_EXPORT))
+
+../x509if/x509if-exp.cnf:
+	(cd ../x509if && $(MAKE_CNF_EXPORT))
+
+../x509sat/x509sat-exp.cnf:
+	(cd ../x509sat && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/x420/Makefile.common b/asn1/x420/Makefile.common
index a77db73e40..5917494177 100644
--- a/asn1/x420/Makefile.common
+++ b/asn1/x420/Makefile.common
@@ -48,9 +48,24 @@ SRC_FILES = \
 A2W_FLAGS= -b -e
 
 EXTRA_CNF= \
+	../acse/acse-exp.cnf \
 	../ftam/ftam-exp.cnf \
 	../x411/x411-exp.cnf \
 	../x509af/x509af-exp.cnf \
-	../x509ce/x509ce-exp.cnf \
-	../acse/acse-exp.cnf
+	../x509ce/x509ce-exp.cnf
+
+../acse/acse-exp.cnf:
+	(cd ../acse && $(MAKE_CNF_EXPORT))
+
+../ftam/ftam-exp.cnf:
+	(cd ../ftam && $(MAKE_CNF_EXPORT))
+
+../x411/x411-exp.cnf:
+	(cd ../x411 && $(MAKE_CNF_EXPORT))
+
+../x509af/x509af-exp.cnf:
+	(cd ../x509af && $(MAKE_CNF_EXPORT))
+
+../x509ce/x509ce-exp.cnf:
+	(cd ../x509ce && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/x509af/Makefile.common b/asn1/x509af/Makefile.common
index 29727eba22..43711c6ce6 100644
--- a/asn1/x509af/Makefile.common
+++ b/asn1/x509af/Makefile.common
@@ -50,3 +50,12 @@ EXTRA_CNF= \
 	../x509if/x509if-exp.cnf \
 	../x509sat/x509sat-exp.cnf
 
+../x509ce/x509ce-exp.cnf:
+	(cd ../x509ce && $(MAKE_CNF_EXPORT))
+
+../x509if/x509if-exp.cnf:
+	(cd ../x509if && $(MAKE_CNF_EXPORT))
+
+../x509sat/x509sat-exp.cnf:
+	(cd ../x509sat && $(MAKE_CNF_EXPORT))
+
diff --git a/asn1/x509ce/Makefile.common b/asn1/x509ce/Makefile.common
index cec0a12795..f8545d29df 100644
--- a/asn1/x509ce/Makefile.common
+++ b/asn1/x509ce/Makefile.common
@@ -46,8 +46,20 @@ SRC_FILES = \
 A2W_FLAGS= -b -e
 
 EXTRA_CNF= \
-	../x509if/x509if-exp.cnf \
+	../x411/x411-exp.cnf \
 	../x509af/x509af-exp.cnf \
-	../x509sat/x509sat-exp.cnf \
-	../x411/x411-exp.cnf
+	../x509if/x509if-exp.cnf \
+	../x509sat/x509sat-exp.cnf
+
+../x411/x411-exp.cnf:
+	(cd ../x411 && $(MAKE_CNF_EXPORT))
+
+../x509af/x509af-exp.cnf:
+	(cd ../x509af && $(MAKE_CNF_EXPORT))
+
+../x509if/x509if-exp.cnf:
+	(cd ../x509if && $(MAKE_CNF_EXPORT))
+
+../x509sat/x509sat-exp.cnf:
+	(cd ../x509sat && $(MAKE_CNF_EXPORT))
 
diff --git a/asn1/x509if/Makefile.common b/asn1/x509if/Makefile.common
index 3559be7ef7..d87a6aa413 100644
--- a/asn1/x509if/Makefile.common
+++ b/asn1/x509if/Makefile.common
@@ -48,3 +48,6 @@ A2W_FLAGS= -b -e
 EXTRA_CNF= \
 	../x509sat/x509sat-exp.cnf
 
+../x509sat/x509sat-exp.cnf:
+	(cd ../x509sat && $(MAKE_CNF_EXPORT))
+
diff --git a/asn1/x509sat/Makefile.common b/asn1/x509sat/Makefile.common
index 2a3fe50ecb..4074678d08 100644
--- a/asn1/x509sat/Makefile.common
+++ b/asn1/x509sat/Makefile.common
@@ -48,3 +48,6 @@ A2W_FLAGS= -b -e
 EXTRA_CNF= \
 	../x509if/x509if-exp.cnf
 
+../x509if/x509if-exp.cnf:
+	(cd ../x509if && $(MAKE_CNF_EXPORT))
+