From cf012d27b10930edc93ca0e44d2a38e69200169f Mon Sep 17 00:00:00 2001
From: Jeff Morriss <jeff.morriss@ulticom.com>
Date: Mon, 10 Oct 2011 02:31:11 +0000
Subject: Build the ASN.1 dissectors directly into epan/dissectors (rather than
 building them and then copying them over).  The "all" target to builds these
 dissectors now (instead of "generate_files" and/or "copy_files").

asn2wrs's "-O" option now means "the dissector goes in this directory" (rather
than "all output goes in this directory"); it also means that the "-s" (single
output file) option is now required.

Fix things up so that it's possible to build all of the ASN.1 dissectors in
one shot.

Fix building of conformance files when doing out-of-source-tree builds.


Unfortunately "make all" in the asn1 directory always builds something--I think
because of circular depedencies.

svn path=/trunk/; revision=39333
---
 asn1/dop/Makefile.common | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

(limited to 'asn1/dop')

diff --git a/asn1/dop/Makefile.common b/asn1/dop/Makefile.common
index dfa410f604..a015b70873 100644
--- a/asn1/dop/Makefile.common
+++ b/asn1/dop/Makefile.common
@@ -22,10 +22,6 @@
 
 PROTOCOL_NAME=dop
 
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
-	packet-$(PROTOCOL_NAME).h
-
-
 EXPORT_FILES = \
 	$(PROTOCOL_NAME)-exp.cnf
 
@@ -49,28 +45,28 @@ SRC_FILES = \
 A2W_FLAGS= -b -e
 
 EXTRA_CNF= \
-        ../dap/dap-exp.cnf \
-        ../dsp/dsp-exp.cnf \
-        ../crmf/crmf-exp.cnf \
-        ../x509af/x509af-exp.cnf \
-        ../x509if/x509if-exp.cnf \
-        ../x509sat/x509sat-exp.cnf
+        $(builddir)/../dap/dap-exp.cnf \
+        $(builddir)/../dsp/dsp-exp.cnf \
+        $(builddir)/../crmf/crmf-exp.cnf \
+        $(builddir)/../x509af/x509af-exp.cnf \
+        $(builddir)/../x509if/x509if-exp.cnf \
+        $(builddir)/../x509sat/x509sat-exp.cnf
 
-../dap/dap-exp.cnf:
-	(cd ../dap && $(MAKE_CNF_EXPORT))
+$(builddir)/../dap/dap-exp.cnf:
+	(cd $(builddir)/../dap && $(MAKE_CNF_EXPORT))
 
-../dsp/dsp-exp.cnf:
-	(cd ../dsp && $(MAKE_CNF_EXPORT))
+$(builddir)/../dsp/dsp-exp.cnf:
+	(cd $(builddir)/../dsp && $(MAKE_CNF_EXPORT))
 
-../crmf/crmf-exp.cnf:
-	(cd ../crmf && $(MAKE_CNF_EXPORT))
+$(builddir)/../crmf/crmf-exp.cnf:
+	(cd $(builddir)/../crmf && $(MAKE_CNF_EXPORT))
 
-../x509af/x509af-exp.cnf:
-	(cd ../x509af && $(MAKE_CNF_EXPORT))
+$(builddir)/../x509af/x509af-exp.cnf:
+	(cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
 
-../x509if/x509if-exp.cnf:
-	(cd ../x509if && $(MAKE_CNF_EXPORT))
+$(builddir)/../x509if/x509if-exp.cnf:
+	(cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
 
-../x509sat/x509sat-exp.cnf:
-	(cd ../x509sat && $(MAKE_CNF_EXPORT))
+$(builddir)/../x509sat/x509sat-exp.cnf:
+	(cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
 
-- 
cgit v1.2.3