From fb834104e517869dfb9953e3379da608cd75c928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Tue, 17 Sep 2013 18:02:25 +0000 Subject: When building packet-dap.c on an empty build tree, packet-dap.c would be incorrect on the first pass and only be correct when remade. The reason was that disp-exp.cnf was created incorrectly on first pass. disp-exp.cnf required dop-exp.cnf to build correctly, so add a mechanism to add dependencies for export files. Note: Only the cmake change has been tested, the autofoo stuff requires testing. svn path=/trunk/; revision=52120 --- asn1/disp/CMakeLists.txt | 4 ++++ asn1/disp/Makefile.common | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'asn1/disp') diff --git a/asn1/disp/CMakeLists.txt b/asn1/disp/CMakeLists.txt index 437df2da2a..745e5a72e9 100644 --- a/asn1/disp/CMakeLists.txt +++ b/asn1/disp/CMakeLists.txt @@ -58,5 +58,9 @@ set( EXTRA_CNF x509if-exp.cnf ) +set( EXPORT_DEPENDS + dop-exp.cnf +) + ASN2WRS() diff --git a/asn1/disp/Makefile.common b/asn1/disp/Makefile.common index 6db2fbc6be..e957d6268c 100644 --- a/asn1/disp/Makefile.common +++ b/asn1/disp/Makefile.common @@ -45,7 +45,10 @@ SRC_FILES = \ A2W_FLAGS= -b -EXTRA_CNF= \ +EXPORT_DEPENDS = \ + $(builddir)/../dop-exp.cnf + +EXTRA_CNF = \ $(builddir)/../dap/dap-exp.cnf \ $(builddir)/../dop/dop-exp.cnf \ $(builddir)/../dsp/dsp-exp.cnf \ -- cgit v1.2.1