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
2011-10-14 10:22:01 +00:00 · 2011-10-14 10:22:01 +00:00 · b21b495f9f
parent 5ae2712e9a
commit b21b495f9f
36 changed files with 51 additions and 51 deletions
--- 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 \
--- 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 \
--- 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
--- 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 =



--- 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
--- 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 \
--- 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=
--- 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
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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

--- 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=

--- 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 \
--- 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
--- 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 =

--- 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 \
--- 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
--- 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))
--- 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=

--- 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 =

--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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))
--- 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 =

--- 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 =

--- 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=

--- 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=

--- 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 \
--- 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 \
--- 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
--- 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))