Don't generate the conformance file for exported types when building the

dissector; instead built it only when the separate target (generate_export)
is built.

Built generate_export when building "all".

This prevents the exp_*.cnf files from being regenerated each time another one
of the exp_*.cnf files (which the current dissector depends on) has changed
(despite the fact that the exported types does not depe

Also fix the CLEANFILES definition so it actually cleans things.

svn path=/trunk/; revision=39421

36 files changed, 51 insertions, 51 deletions

diff --git a/asn1/Makefile.inc b/asn1/Makefile.inc
index a105a6f461..b34e55b27f 100644
--- a/asn1/Makefile.inc
+++ b/asn1/Makefile.inc
@@ -25,7 +25,7 @@ DISSECTOR = $(top_srcdir)/epan/dissectors/packet-$(PROTOCOL_NAME).c
 # This header file need not exist/get generated.  It is only used when cleaning.
 DISSECTOR_HEADER=$(top_srcdir)/epan/dissectors/packet-$(PROTOCOL_NAME).h
 
-all: $(DISSECTOR)
+all: generate_export $(DISSECTOR)
 
 generate_export: $(EXPORT_FILES)
 
@@ -51,7 +51,7 @@ $(EXPORT_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES)
 
 # Don't clean these up until/unless we start building them...
 #$(DISSECTOR) \
-#$(DISSECTOR_HEADER) \
+#$(DISSECTOR_HEADER)
 CLEANFILES = \
 	parsetab.py \
 	parsetab.pyc \
diff --git a/asn1/Makefile.inc.nmake b/asn1/Makefile.inc.nmake
index d6f0b88310..e5159e680d 100644
--- a/asn1/Makefile.inc.nmake
+++ b/asn1/Makefile.inc.nmake
@@ -66,7 +66,7 @@ $(EXPORT_FILES): ../../tools/asn2wrs.py $(SRC_FILES)
 
 # Don't clean these up until/unless we start building them...
 #		$(DISSECTOR) \
-#		$(DISSECTOR_HEADER) \
+#		$(DISSECTOR_HEADER)
 clean:
 	rm -f parsetab.py \
 		parsetab.pyc \
diff --git a/asn1/acse/Makefile.common b/asn1/acse/Makefile.common
index f35f9901d1..cc86e322c9 100644
--- a/asn1/acse/Makefile.common
+++ b/asn1/acse/Makefile.common
@@ -42,7 +42,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e -C
+A2W_FLAGS= -b -C
 
 EXTRA_CNF= \
 	$(builddir)/../x509if/x509if-exp.cnf
diff --git a/asn1/charging_ase/Makefile.common b/asn1/charging_ase/Makefile.common
index 5e66572649..bb22035d3b 100644
--- a/asn1/charging_ase/Makefile.common
+++ b/asn1/charging_ase/Makefile.common
@@ -39,9 +39,9 @@ SRC_FILES = \
 	$(EXT_ASN_FILE_LIST) \
 	$(EXTRA_DIST)
 
-A2W_FLAGS= -b -e
+A2W_FLAGS= -b
 
-EXTRA_CNF = 
+EXTRA_CNF =
 
 
 
diff --git a/asn1/cmip/Makefile.common b/asn1/cmip/Makefile.common
index 24781c6676..5a14b31e4a 100644
--- a/asn1/cmip/Makefile.common
+++ b/asn1/cmip/Makefile.common
@@ -48,7 +48,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e
+A2W_FLAGS= -b
 
 EXTRA_CNF= \
 	$(builddir)/../acse/acse-exp.cnf
diff --git a/asn1/cms/Makefile.common b/asn1/cms/Makefile.common
index 2931d24586..35b9a4737b 100644
--- a/asn1/cms/Makefile.common
+++ b/asn1/cms/Makefile.common
@@ -42,7 +42,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e -C
+A2W_FLAGS= -b -C
 
 EXTRA_CNF= \
 	$(builddir)/../x509af/x509af-exp.cnf \
diff --git a/asn1/credssp/Makefile.common b/asn1/credssp/Makefile.common
index 8652497a4b..5c62221427 100644
--- a/asn1/credssp/Makefile.common
+++ b/asn1/credssp/Makefile.common
@@ -41,6 +41,6 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e -C
+A2W_FLAGS= -b -C
 
-EXTRA_CNF= 
+EXTRA_CNF=
diff --git a/asn1/crmf/Makefile.common b/asn1/crmf/Makefile.common
index da2e45a440..63c3544be7 100644
--- a/asn1/crmf/Makefile.common
+++ b/asn1/crmf/Makefile.common
@@ -41,7 +41,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e 
+A2W_FLAGS= -b
 
 EXTRA_CNF= \
 	$(builddir)/../cms/cms-exp.cnf
diff --git a/asn1/dap/Makefile.common b/asn1/dap/Makefile.common
index 0233632828..6ebe2d4863 100644
--- a/asn1/dap/Makefile.common
+++ b/asn1/dap/Makefile.common
@@ -45,7 +45,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e -L
+A2W_FLAGS= -b -L
 
 EXTRA_CNF= \
 	$(builddir)/../acse/acse-exp.cnf \
diff --git a/asn1/disp/Makefile.common b/asn1/disp/Makefile.common
index 0930d60e6b..fcc6605456 100644
--- a/asn1/disp/Makefile.common
+++ b/asn1/disp/Makefile.common
@@ -42,7 +42,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e 
+A2W_FLAGS= -b
 
 EXTRA_CNF= \
 	$(builddir)/../dap/dap-exp.cnf \
diff --git a/asn1/dop/Makefile.common b/asn1/dop/Makefile.common
index a015b70873..eed560c815 100644
--- a/asn1/dop/Makefile.common
+++ b/asn1/dop/Makefile.common
@@ -42,7 +42,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e
+A2W_FLAGS= -b
 
 EXTRA_CNF= \
         $(builddir)/../dap/dap-exp.cnf \
diff --git a/asn1/dsp/Makefile.common b/asn1/dsp/Makefile.common
index e076db8e0d..8194f7f54d 100644
--- a/asn1/dsp/Makefile.common
+++ b/asn1/dsp/Makefile.common
@@ -42,7 +42,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e 
+A2W_FLAGS= -b
 
 EXTRA_CNF = \
 	$(builddir)/../dap/dap-exp.cnf \
diff --git a/asn1/ess/Makefile.common b/asn1/ess/Makefile.common
index 9ddb2363bd..19e10bddf2 100644
--- a/asn1/ess/Makefile.common
+++ b/asn1/ess/Makefile.common
@@ -39,7 +39,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e -k -C
+A2W_FLAGS= -b -k -C
 
 EXTRA_CNF= \
 	$(builddir)/../cms/cms-exp.cnf \
diff --git a/asn1/gprscdr/Makefile.common b/asn1/gprscdr/Makefile.common
index 262b03093a..02dacefbd2 100644
--- a/asn1/gprscdr/Makefile.common
+++ b/asn1/gprscdr/Makefile.common
@@ -42,7 +42,7 @@ SRC_FILES = \
 	$(EXT_ASN_FILE_LIST) \
 	$(EXTRA_DIST)
 
-A2W_FLAGS= -b -e
+A2W_FLAGS= -b
 
 EXTRA_CNF=$(builddir)/../gsm_map/gsm_map-exp.cnf
 
diff --git a/asn1/gsm_map/Makefile.common b/asn1/gsm_map/Makefile.common
index c296b38eb5..3e5f0b47bc 100644
--- a/asn1/gsm_map/Makefile.common
+++ b/asn1/gsm_map/Makefile.common
@@ -83,7 +83,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e
+A2W_FLAGS= -b
 
 EXTRA_CNF=
 
diff --git a/asn1/h225/Makefile.common b/asn1/h225/Makefile.common
index c4f04c0fd2..208a1bcc71 100644
--- a/asn1/h225/Makefile.common
+++ b/asn1/h225/Makefile.common
@@ -42,7 +42,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -e
+A2W_FLAGS=
 
 EXTRA_CNF = \
 	$(builddir)/../h235/h235-exp.cnf \
diff --git a/asn1/h235/Makefile.common b/asn1/h235/Makefile.common
index 9fd06e4a49..e36b83caec 100644
--- a/asn1/h235/Makefile.common
+++ b/asn1/h235/Makefile.common
@@ -43,7 +43,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS = -e
+A2W_FLAGS =
 
 EXTRA_CNF = \
 	$(builddir)/../h225/h225-exp.cnf
diff --git a/asn1/h245/Makefile.common b/asn1/h245/Makefile.common
index 287a85310f..00f64c7ba6 100644
--- a/asn1/h245/Makefile.common
+++ b/asn1/h245/Makefile.common
@@ -25,7 +25,7 @@ PROTOCOL_NAME = h245
 EXPORT_FILES = \
 	$(PROTOCOL_NAME)-exp.cnf
 
-EXT_ASN_FILE_LIST = 
+EXT_ASN_FILE_LIST =
 
 ASN_FILE_LIST = \
 	MULTIMEDIA-SYSTEM-CONTROL.asn
@@ -41,7 +41,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS = -e
+A2W_FLAGS =
 
-EXTRA_CNF = 
+EXTRA_CNF =
 
diff --git a/asn1/h450-ros/Makefile.common b/asn1/h450-ros/Makefile.common
index 32c8cdaeb3..ffbeed251f 100644
--- a/asn1/h450-ros/Makefile.common
+++ b/asn1/h450-ros/Makefile.common
@@ -44,7 +44,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -e
+A2W_FLAGS=
 
 EXTRA_CNF = \
 	$(builddir)/../ros/ros-inv.cnf \
diff --git a/asn1/idmp/Makefile.common b/asn1/idmp/Makefile.common
index 7ad3b3409c..08e781a50f 100644
--- a/asn1/idmp/Makefile.common
+++ b/asn1/idmp/Makefile.common
@@ -46,7 +46,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e -L
+A2W_FLAGS= -b -L
 
 EXTRA_CNF= \
 	$(builddir)/../x509ce/x509ce-exp.cnf
diff --git a/asn1/inap/Makefile.common b/asn1/inap/Makefile.common
index 684238bff5..575c36674e 100644
--- a/asn1/inap/Makefile.common
+++ b/asn1/inap/Makefile.common
@@ -67,14 +67,14 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e
+A2W_FLAGS= -b
 
 EXTRA_CNF= \
 	$(builddir)/../dap/dap-exp.cnf \
 	$(builddir)/../dsp/dsp-exp.cnf
-	
+
 $(builddir)/../dap/dap-exp.cnf:
-	(cd $(builddir)/../dap && $(MAKE_CNF_EXPORT))	
+	(cd $(builddir)/../dap && $(MAKE_CNF_EXPORT))
 
 $(builddir)/../dsp/dsp-exp.cnf:
-	(cd $(builddir)/../dsp && $(MAKE_CNF_EXPORT))	
+	(cd $(builddir)/../dsp && $(MAKE_CNF_EXPORT))
diff --git a/asn1/kerberos/Makefile.common b/asn1/kerberos/Makefile.common
index f12e47468a..2a7184b231 100644
--- a/asn1/kerberos/Makefile.common
+++ b/asn1/kerberos/Makefile.common
@@ -42,7 +42,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e
+A2W_FLAGS= -b
 
 EXTRA_CNF=
 
diff --git a/asn1/lte-rrc/Makefile.common b/asn1/lte-rrc/Makefile.common
index 2df46fe634..dc93193154 100644
--- a/asn1/lte-rrc/Makefile.common
+++ b/asn1/lte-rrc/Makefile.common
@@ -22,15 +22,15 @@
 
 PROTOCOL_NAME = lte-rrc
 
-EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf	
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
 
-EXT_ASN_FILE_LIST = 
+EXT_ASN_FILE_LIST =
 
 ASN_FILE_LIST = \
 	EUTRA-RRC-Definitions.asn \
 	EUTRA-UE-Variables.asn \
 	EUTRA-InterNodeDefinitions.asn
-	
+
 EXTRA_DIST = \
 	Makefile.nmake \
 	$(ASN_FILE_LIST) \
@@ -42,7 +42,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS = -e -L
+A2W_FLAGS = -L
 
-EXTRA_CNF = 
+EXTRA_CNF =
 
diff --git a/asn1/p1/Makefile.common b/asn1/p1/Makefile.common
index 356780a412..2c40443cb4 100644
--- a/asn1/p1/Makefile.common
+++ b/asn1/p1/Makefile.common
@@ -42,7 +42,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e -C
+A2W_FLAGS= -b -C
 
 EXTRA_CNF= \
 	$(builddir)/../x509af/x509af-exp.cnf \
diff --git a/asn1/p22/Makefile.common b/asn1/p22/Makefile.common
index cc2ea7048d..217f88e4ac 100644
--- a/asn1/p22/Makefile.common
+++ b/asn1/p22/Makefile.common
@@ -51,7 +51,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e -C
+A2W_FLAGS= -b -C
 
 EXTRA_CNF= \
 	$(builddir)/../acse/acse-exp.cnf \
diff --git a/asn1/p7/Makefile.common b/asn1/p7/Makefile.common
index feac989e95..bc14b4fd14 100644
--- a/asn1/p7/Makefile.common
+++ b/asn1/p7/Makefile.common
@@ -46,7 +46,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e -L -C
+A2W_FLAGS= -b -L -C
 
 EXTRA_CNF= \
 	$(builddir)/../p1/p1-exp.cnf \
diff --git a/asn1/p772/Makefile.common b/asn1/p772/Makefile.common
index f345e5c386..1ec9f9411d 100644
--- a/asn1/p772/Makefile.common
+++ b/asn1/p772/Makefile.common
@@ -43,7 +43,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e -C
+A2W_FLAGS= -b -C
 
 EXTRA_CNF= \
 	$(builddir)/../p1/p1-exp.cnf \
diff --git a/asn1/pkcs12/Makefile.common b/asn1/pkcs12/Makefile.common
index 2bf70bd2bc..ba2578f669 100644
--- a/asn1/pkcs12/Makefile.common
+++ b/asn1/pkcs12/Makefile.common
@@ -39,13 +39,13 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e
+A2W_FLAGS= -b
 
-# Note the order here is important, cms needs at least x509af-exp to be generated first 
+# Note the order here is important, cms needs at least x509af-exp to be generated first
 EXTRA_CNF= \
 	$(builddir)/../x509if/x509if-exp.cnf  \
 	$(builddir)/../x509af/x509af-exp.cnf \
-	$(builddir)/../cms/cms-exp.cnf 
+	$(builddir)/../cms/cms-exp.cnf
 
 $(builddir)/../cms/cms-exp.cnf:
 	(cd $(builddir)/../cms && $(MAKE_CNF_EXPORT))
diff --git a/asn1/q932/Makefile.common b/asn1/q932/Makefile.common
index 8b1d901d2d..f217cbf090 100644
--- a/asn1/q932/Makefile.common
+++ b/asn1/q932/Makefile.common
@@ -45,7 +45,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -e -b 
+A2W_FLAGS= -b
 
 EXTRA_CNF =
 
diff --git a/asn1/qsig/Makefile.common b/asn1/qsig/Makefile.common
index 2026fb71cc..c60caf07fa 100644
--- a/asn1/qsig/Makefile.common
+++ b/asn1/qsig/Makefile.common
@@ -71,7 +71,7 @@ SRC_FILES = \
 
 # need empty -p <proto> option, default is -p $(PROTOCOL_NAME)
 PROTO_OPT =
-A2W_FLAGS = -e
+A2W_FLAGS =
 
 EXTRA_CNF =
 
diff --git a/asn1/ros/Makefile.common b/asn1/ros/Makefile.common
index 70340bed7f..7f23dc1a4a 100644
--- a/asn1/ros/Makefile.common
+++ b/asn1/ros/Makefile.common
@@ -50,7 +50,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e 
+A2W_FLAGS= -b
 
 EXTRA_CNF=
 
diff --git a/asn1/rtse/Makefile.common b/asn1/rtse/Makefile.common
index 1515117bb1..011341d34a 100644
--- a/asn1/rtse/Makefile.common
+++ b/asn1/rtse/Makefile.common
@@ -41,7 +41,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e 
+A2W_FLAGS= -b
 
 EXTRA_CNF=
 
diff --git a/asn1/x509af/Makefile.common b/asn1/x509af/Makefile.common
index 2ffe143e77..5a14020129 100644
--- a/asn1/x509af/Makefile.common
+++ b/asn1/x509af/Makefile.common
@@ -41,7 +41,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e 
+A2W_FLAGS= -b
 
 EXTRA_CNF= \
 	$(builddir)/../x509ce/x509ce-exp.cnf \
diff --git a/asn1/x509ce/Makefile.common b/asn1/x509ce/Makefile.common
index ebd14e9a6c..c170347732 100644
--- a/asn1/x509ce/Makefile.common
+++ b/asn1/x509ce/Makefile.common
@@ -41,7 +41,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e 
+A2W_FLAGS= -b
 
 EXTRA_CNF= \
 	$(builddir)/../p1/p1-exp.cnf \
diff --git a/asn1/x509if/Makefile.common b/asn1/x509if/Makefile.common
index 04d749590a..b5a6c6be95 100644
--- a/asn1/x509if/Makefile.common
+++ b/asn1/x509if/Makefile.common
@@ -42,7 +42,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e 
+A2W_FLAGS= -b
 
 EXTRA_CNF= \
 	$(builddir)/../x509sat/x509sat-exp.cnf
diff --git a/asn1/x509sat/Makefile.common b/asn1/x509sat/Makefile.common
index fc1da9261e..657b7296d6 100644
--- a/asn1/x509sat/Makefile.common
+++ b/asn1/x509sat/Makefile.common
@@ -42,11 +42,11 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e -r Syntax
+A2W_FLAGS= -b -r Syntax
 
 EXTRA_CNF= \
 	$(builddir)/../x509if/x509if-exp.cnf \
-	$(builddir)/../p1/p1-exp.cnf 
+	$(builddir)/../p1/p1-exp.cnf
 
 $(builddir)/../x509if/x509if-exp.cnf:
 	(cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))