diff options
100 files changed, 360 insertions, 713 deletions
diff --git a/asn1/HI2Operations/Makefile.common b/asn1/HI2Operations/Makefile.common index 48ea225eda..7dbe9f5be5 100644 --- a/asn1/HI2Operations/Makefile.common +++ b/asn1/HI2Operations/Makefile.common @@ -22,8 +22,6 @@ PROTOCOL_NAME=HI2Operations -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c - ASN_FILE_LIST = HI2Operations_ver11.asn \ UmtsHI2Operations.asn \ TS101909201.asn \ diff --git a/asn1/Makefile.inc b/asn1/Makefile.inc index e519f6234a..f876b0d690 100644 --- a/asn1/Makefile.inc +++ b/asn1/Makefile.inc @@ -21,21 +21,24 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -all: copy_files +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 -generate_dissector: $(DISSECTOR_FILES) +all: $(DISSECTOR) generate_export: $(EXPORT_FILES) PROTO_OPT ?= -p $(PROTOCOL_NAME) -$(DISSECTOR_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) +$(DISSECTOR): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) python $(top_srcdir)/tools/asn2wrs.py \ $(A2W_FLAGS) \ $(PROTO_OPT) \ -c $(srcdir)/$(PROTOCOL_NAME).cnf \ -s $(srcdir)/packet-$(PROTOCOL_NAME)-template \ -D $(srcdir) \ + -O $(top_srcdir)/epan/dissectors \ $(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE) $(EXPORT_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) @@ -46,13 +49,11 @@ $(EXPORT_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) -D $(srcdir) \ $(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE) -copy_files: generate_dissector - cp $(DISSECTOR_FILES) $(top_srcdir)/epan/dissectors/ - CLEANFILES = \ parsetab.py \ parsetab.pyc \ - $(DISSECTOR_FILES) \ + $(DISSECTOR) \ + $(DISSECTOR_HEADER) \ *-exp.cnf \ packet-*-{dis-tab,ettarr,ett,exp,fn,hfarr,hf,table*,val}.[hc] diff --git a/asn1/Makefile.inc.nmake b/asn1/Makefile.inc.nmake index 76e320e107..81f31e6de7 100644 --- a/asn1/Makefile.inc.nmake +++ b/asn1/Makefile.inc.nmake @@ -21,7 +21,12 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -generate_dissector: $(DISSECTOR_FILES) + +DISSECTOR=../../epan/dissectors/packet-$(PROTOCOL_NAME).c +# This header file need not exist/get generated. It is only used when cleaning. +DISSECTOR_HEADER=../../epan/dissectors/packet-$(PROTOCOL_NAME).h + +all: $(DISSECTOR) generate_export: $(EXPORT_FILES) @@ -29,7 +34,7 @@ generate_export: $(EXPORT_FILES) PROTO_OPT = -p $(PROTOCOL_NAME) !ENDIF -$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) +$(DISSECTOR): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) !IFDEF PYTHON $(PYTHON) "../../tools/asn2wrs.py" \ $(A2W_FLAGS) \ @@ -37,6 +42,7 @@ $(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) -c ./$(PROTOCOL_NAME).cnf \ -s ./packet-$(PROTOCOL_NAME)-template \ -D . \ + -O ../../epan/dissectors \ $(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE) !ELSE @echo Error: You need Python to use asn2wrs.py @@ -61,7 +67,8 @@ $(EXPORT_FILES): ../../tools/asn2wrs.py $(SRC_FILES) clean: rm -f parsetab.py \ parsetab.pyc \ - $(DISSECTOR_FILES) \ + $(DISSECTOR) \ + $(DISSECTOR_HEADER) \ *-exp.cnf \ packet-*-{dis-tab,ettarr,ett,fn,hfarr,hf,table*,val}.[hc] diff --git a/asn1/Makefile.preinc b/asn1/Makefile.preinc index 18b62215e1..99873fc8a7 100644 --- a/asn1/Makefile.preinc +++ b/asn1/Makefile.preinc @@ -23,6 +23,3 @@ MAKE_CNF_EXPORT = $(MAKE) generate_export -# Don't generate all the dissectors during toplevel make. -all: - diff --git a/asn1/Makefile.preinc.nmake b/asn1/Makefile.preinc.nmake index 15c8cc2ec3..aae61994e0 100644 --- a/asn1/Makefile.preinc.nmake +++ b/asn1/Makefile.preinc.nmake @@ -24,6 +24,8 @@ MAKE_CNF_EXPORT = $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake generate_export +# An automake variable used in several Makefile.common's +builddir=. all: generate_dissector diff --git a/asn1/acp133/Makefile.common b/asn1/acp133/Makefile.common index fa35dfc2a2..0832ff5c9d 100644 --- a/asn1/acp133/Makefile.common +++ b/asn1/acp133/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=acp133 -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = $(PROTOCOL_NAME).asn MHSDirectoryObjectsAndAttributes.asn @@ -46,20 +42,20 @@ SRC_FILES = \ A2W_FLAGS= -b EXTRA_CNF= \ - ../p1/p1-exp.cnf \ - ../x509af/x509af-exp.cnf \ - ../x509ce/x509ce-exp.cnf \ - ../x509if/x509if-exp.cnf + $(builddir)/../p1/p1-exp.cnf \ + $(builddir)/../x509af/x509af-exp.cnf \ + $(builddir)/../x509ce/x509ce-exp.cnf \ + $(builddir)/../x509if/x509if-exp.cnf -../p1/p1-exp.cnf: - (cd ../p1 && $(MAKE_CNF_EXPORT)) +$(builddir)/../p1/p1-exp.cnf: + (cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT)) -../x509af/x509af-exp.cnf: - (cd ../x509af && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509af/x509af-exp.cnf: + (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT)) -../x509ce/x509ce-exp.cnf: - (cd ../x509ce && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509ce/x509ce-exp.cnf: + (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT)) -../x509if/x509if-exp.cnf: - (cd ../x509if && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509if/x509if-exp.cnf: + (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT)) diff --git a/asn1/acse/Makefile.common b/asn1/acse/Makefile.common index 346cd59800..f35f9901d1 100644 --- a/asn1/acse/Makefile.common +++ b/asn1/acse/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=acse -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = \ $(PROTOCOL_NAME)-exp.cnf @@ -49,8 +45,8 @@ SRC_FILES = \ A2W_FLAGS= -b -e -C EXTRA_CNF= \ - ../x509if/x509if-exp.cnf + $(builddir)/../x509if/x509if-exp.cnf -../x509if/x509if-exp.cnf: - (cd ../x509if && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509if/x509if-exp.cnf: + (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT)) diff --git a/asn1/ansi_map/Makefile.common b/asn1/ansi_map/Makefile.common index 541e5cc227..7316729c67 100644 --- a/asn1/ansi_map/Makefile.common +++ b/asn1/ansi_map/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=ansi_map -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = $(PROTOCOL_NAME).asn @@ -46,8 +42,8 @@ SRC_FILES = \ A2W_FLAGS= -b EXTRA_CNF= \ - ../gsm_map/gsm_map-exp.cnf + $(builddir)/../gsm_map/gsm_map-exp.cnf -../gsm_map/gsm_map-exp.cnf: - (cd ../gsm_map && $(MAKE_CNF_EXPORT)) +$(builddir)/../gsm_map/gsm_map-exp.cnf: + (cd $(builddir)/../gsm_map && $(MAKE_CNF_EXPORT)) diff --git a/asn1/ansi_tcap/Makefile.common b/asn1/ansi_tcap/Makefile.common index 3ee663a0ff..1f9a74135f 100644 --- a/asn1/ansi_tcap/Makefile.common +++ b/asn1/ansi_tcap/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=ansi_tcap -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ diff --git a/asn1/camel/Makefile.common b/asn1/camel/Makefile.common index ad3f7e0937..3ff4ca3227 100644 --- a/asn1/camel/Makefile.common +++ b/asn1/camel/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=camel -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST_LATE = \ ../ros/Remote-Operations-Information-Objects.asn \ ../ros/Remote-Operations-Generic-ROS-PDUs.asn @@ -60,12 +56,12 @@ SRC_FILES = \ A2W_FLAGS= -b -L -EXTRA_CNF=../inap/inap-exp.cnf \ - ../gsm_map/gsm_map-exp.cnf +EXTRA_CNF=$(builddir)/../inap/inap-exp.cnf \ + $(builddir)/../gsm_map/gsm_map-exp.cnf -../gsm_map/gsm_map-exp.cnf: - (cd ../gsm_map && $(MAKE_CNF_EXPORT)) +$(builddir)/../gsm_map/gsm_map-exp.cnf: + (cd $(builddir)/../gsm_map && $(MAKE_CNF_EXPORT)) -../inap/inap-exp.cnf: - (cd ../inap && $(MAKE_CNF_EXPORT)) +$(builddir)/../inap/inap-exp.cnf: + (cd $(builddir)/../inap && $(MAKE_CNF_EXPORT)) diff --git a/asn1/cdt/Makefile.common b/asn1/cdt/Makefile.common index 61eb58def6..fa271a261e 100644 --- a/asn1/cdt/Makefile.common +++ b/asn1/cdt/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=cdt -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = $(PROTOCOL_NAME).asn diff --git a/asn1/charging_ase/Makefile.common b/asn1/charging_ase/Makefile.common index 479b3b4b42..5e66572649 100644 --- a/asn1/charging_ase/Makefile.common +++ b/asn1/charging_ase/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=charging_ase -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - ASN_FILE_LIST = \ Tariffing-Data-Types.asn diff --git a/asn1/cmip/Makefile.common b/asn1/cmip/Makefile.common index 46c45db559..24781c6676 100644 --- a/asn1/cmip/Makefile.common +++ b/asn1/cmip/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=cmip -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = \ $(PROTOCOL_NAME)-exp.cnf @@ -55,8 +51,8 @@ SRC_FILES = \ A2W_FLAGS= -b -e EXTRA_CNF= \ - ../acse/acse-exp.cnf + $(builddir)/../acse/acse-exp.cnf -../acse/acse-exp.cnf: - (cd ../acse && $(MAKE_CNF_EXPORT)) +$(builddir)/../acse/acse-exp.cnf: + (cd $(builddir)/../acse && $(MAKE_CNF_EXPORT)) diff --git a/asn1/cmp/Makefile.common b/asn1/cmp/Makefile.common index fcee4d0a6b..98b69188a5 100644 --- a/asn1/cmp/Makefile.common +++ b/asn1/cmp/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=cmp -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = CMP.asn @@ -46,10 +42,10 @@ SRC_FILES = \ A2W_FLAGS= -b EXTRA_CNF= \ - ../pkix1explicit/pkix1explicit_exp.cnf \ - ../pkix1implicit/pkix1implicit_exp.cnf \ - ../crmf/crmf-exp.cnf + $(builddir)/../pkix1explicit/pkix1explicit_exp.cnf \ + $(builddir)/../pkix1implicit/pkix1implicit_exp.cnf \ + $(builddir)/../crmf/crmf-exp.cnf -../crmf/crmf-exp.cnf: - (cd ../crmf && $(MAKE_CNF_EXPORT)) +$(builddir)/../crmf/crmf-exp.cnf: + (cd $(builddir)/../crmf && $(MAKE_CNF_EXPORT)) diff --git a/asn1/cms/Makefile.common b/asn1/cms/Makefile.common index 247d2cebf3..2931d24586 100644 --- a/asn1/cms/Makefile.common +++ b/asn1/cms/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=cms -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = \ $(PROTOCOL_NAME)-exp.cnf @@ -49,20 +45,20 @@ SRC_FILES = \ A2W_FLAGS= -b -e -C EXTRA_CNF= \ - ../x509af/x509af-exp.cnf \ - ../x509ce/x509ce-exp.cnf \ - ../x509if/x509if-exp.cnf \ - ../x509sat/x509sat-exp.cnf + $(builddir)/../x509af/x509af-exp.cnf \ + $(builddir)/../x509ce/x509ce-exp.cnf \ + $(builddir)/../x509if/x509if-exp.cnf \ + $(builddir)/../x509sat/x509sat-exp.cnf -../x509af/x509af-exp.cnf: - (cd ../x509af && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509af/x509af-exp.cnf: + (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT)) -../x509ce/x509ce-exp.cnf: - (cd ../x509ce && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509ce/x509ce-exp.cnf: + (cd $(builddir)/../x509ce && $(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)) diff --git a/asn1/credssp/Makefile.common b/asn1/credssp/Makefile.common index 24ead6d71f..8652497a4b 100644 --- a/asn1/credssp/Makefile.common +++ b/asn1/credssp/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=credssp -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf EXT_ASN_FILE_LIST = diff --git a/asn1/crmf/Makefile.common b/asn1/crmf/Makefile.common index 86dd8fc959..da2e45a440 100644 --- a/asn1/crmf/Makefile.common +++ b/asn1/crmf/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=crmf -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf EXT_ASN_FILE_LIST = @@ -48,8 +44,8 @@ SRC_FILES = \ A2W_FLAGS= -b -e EXTRA_CNF= \ - ../cms/cms-exp.cnf + $(builddir)/../cms/cms-exp.cnf -../cms/cms-exp.cnf: - (cd ../cms && $(MAKE_CNF_EXPORT)) +$(builddir)/../cms/cms-exp.cnf: + (cd $(builddir)/../cms && $(MAKE_CNF_EXPORT)) diff --git a/asn1/dap/Makefile.common b/asn1/dap/Makefile.common index 238986dce9..0233632828 100644 --- a/asn1/dap/Makefile.common +++ b/asn1/dap/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=dap -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = \ $(PROTOCOL_NAME)-exp.cnf @@ -52,40 +48,40 @@ SRC_FILES = \ A2W_FLAGS= -b -e -L EXTRA_CNF= \ - ../acse/acse-exp.cnf \ - ../dop/dop-exp.cnf \ - ../disp/disp-exp.cnf \ - ../dsp/dsp-exp.cnf \ - ../crmf/crmf-exp.cnf \ - ../ros/ros-exp.cnf \ - ../x509af/x509af-exp.cnf \ - ../x509if/x509if-exp.cnf \ - ../x509sat/x509sat-exp.cnf + $(builddir)/../acse/acse-exp.cnf \ + $(builddir)/../dop/dop-exp.cnf \ + $(builddir)/../disp/disp-exp.cnf \ + $(builddir)/../dsp/dsp-exp.cnf \ + $(builddir)/../crmf/crmf-exp.cnf \ + $(builddir)/../ros/ros-exp.cnf \ + $(builddir)/../x509af/x509af-exp.cnf \ + $(builddir)/../x509if/x509if-exp.cnf \ + $(builddir)/../x509sat/x509sat-exp.cnf -../acse/acse-exp.cnf: - (cd ../acse && $(MAKE_CNF_EXPORT)) +$(builddir)/../acse/acse-exp.cnf: + (cd $(builddir)/../acse && $(MAKE_CNF_EXPORT)) -../dop/dop-exp.cnf: - (cd ../dop && $(MAKE_CNF_EXPORT)) +$(builddir)/../dop/dop-exp.cnf: + (cd $(builddir)/../dop && $(MAKE_CNF_EXPORT)) -../disp/disp-exp.cnf: - (cd ../disp && $(MAKE_CNF_EXPORT)) +$(builddir)/../disp/disp-exp.cnf: + (cd $(builddir)/../disp && $(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)) -../ros/ros-exp.cnf: - (cd ../ros && $(MAKE_CNF_EXPORT)) +$(builddir)/../ros/ros-exp.cnf: + (cd $(builddir)/../ros && $(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)) diff --git a/asn1/disp/Makefile.common b/asn1/disp/Makefile.common index 772f58541c..0930d60e6b 100644 --- a/asn1/disp/Makefile.common +++ b/asn1/disp/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=disp -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = \ $(PROTOCOL_NAME)-exp.cnf @@ -49,24 +45,24 @@ SRC_FILES = \ A2W_FLAGS= -b -e EXTRA_CNF= \ - ../dap/dap-exp.cnf \ - ../dop/dop-exp.cnf \ - ../dsp/dsp-exp.cnf \ - ../x509af/x509af-exp.cnf \ - ../x509if/x509if-exp.cnf + $(builddir)/../dap/dap-exp.cnf \ + $(builddir)/../dop/dop-exp.cnf \ + $(builddir)/../dsp/dsp-exp.cnf \ + $(builddir)/../x509af/x509af-exp.cnf \ + $(builddir)/../x509if/x509if-exp.cnf -../dap/dap-exp.cnf: - (cd ../dap && $(MAKE_CNF_EXPORT)) +$(builddir)/../dap/dap-exp.cnf: + (cd $(builddir)/../dap && $(MAKE_CNF_EXPORT)) -../dop/dop-exp.cnf: - (cd ../dop && $(MAKE_CNF_EXPORT)) +$(builddir)/../dop/dop-exp.cnf: + (cd $(builddir)/../dop && $(MAKE_CNF_EXPORT)) -../dsp/dsp-exp.cnf: - (cd ../dsp && $(MAKE_CNF_EXPORT)) +$(builddir)/../dsp/dsp-exp.cnf: + (cd $(builddir)/../dsp && $(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)) 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)) diff --git a/asn1/dsp/Makefile.common b/asn1/dsp/Makefile.common index 3c922a8c94..e076db8e0d 100644 --- a/asn1/dsp/Makefile.common +++ b/asn1/dsp/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=dsp -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = \ $(PROTOCOL_NAME)-exp.cnf @@ -49,20 +45,20 @@ SRC_FILES = \ A2W_FLAGS= -b -e EXTRA_CNF = \ - ../dap/dap-exp.cnf \ - ../x509af/x509af-exp.cnf \ - ../x509if/x509if-exp.cnf \ - ../x509sat/x509sat-exp.cnf + $(builddir)/../dap/dap-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)) -../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)) diff --git a/asn1/ess/Makefile.common b/asn1/ess/Makefile.common index 5c5cc519be..9ddb2363bd 100644 --- a/asn1/ess/Makefile.common +++ b/asn1/ess/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=ess -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = ExtendedSecurityServices.asn @@ -46,16 +42,16 @@ SRC_FILES = \ A2W_FLAGS= -b -e -k -C EXTRA_CNF= \ - ../cms/cms-exp.cnf \ - ../x509af/x509af-exp.cnf \ - ../x509ce/x509ce-exp.cnf + $(builddir)/../cms/cms-exp.cnf \ + $(builddir)/../x509af/x509af-exp.cnf \ + $(builddir)/../x509ce/x509ce-exp.cnf -../cms/cms-exp.cnf: - (cd ../cms && $(MAKE_CNF_EXPORT)) +$(builddir)/../cms/cms-exp.cnf: + (cd $(builddir)/../cms && $(MAKE_CNF_EXPORT)) -../x509af/x509af-exp.cnf: - (cd ../x509af && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509af/x509af-exp.cnf: + (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT)) -../x509ce/x509ce-exp.cnf: - (cd ../x509ce && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509ce/x509ce-exp.cnf: + (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT)) diff --git a/asn1/ftam/Makefile.common b/asn1/ftam/Makefile.common index 856a649bbc..ccc7a6adc7 100644 --- a/asn1/ftam/Makefile.common +++ b/asn1/ftam/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=ftam -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = \ $(PROTOCOL_NAME)-exp.cnf @@ -49,8 +45,8 @@ SRC_FILES = \ A2W_FLAGS= -b EXTRA_CNF= \ - ../acse/acse-exp.cnf + $(builddir)/../acse/acse-exp.cnf -../acse/acse-exp.cnf: - (cd ../acse && $(MAKE_CNF_EXPORT)) +$(builddir)/../acse/acse-exp.cnf: + (cd $(builddir)/../acse && $(MAKE_CNF_EXPORT)) diff --git a/asn1/gnm/Makefile.common b/asn1/gnm/Makefile.common index 1700cac3fd..7689f6906d 100644 --- a/asn1/gnm/Makefile.common +++ b/asn1/gnm/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=gnm -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = GNM.asn @@ -46,8 +42,8 @@ SRC_FILES = \ A2W_FLAGS= -b EXTRA_CNF= \ - ../cmip/cmip-exp.cnf + $(builddir)/../cmip/cmip-exp.cnf -../cmip/cmip-exp.cnf: - (cd ../cmip && $(MAKE_CNF_EXPORT)) +$(builddir)/../cmip/cmip-exp.cnf: + (cd $(builddir)/../cmip && $(MAKE_CNF_EXPORT)) diff --git a/asn1/goose/Makefile.common b/asn1/goose/Makefile.common index 31567f2b10..2cdbf4dafe 100644 --- a/asn1/goose/Makefile.common +++ b/asn1/goose/Makefile.common @@ -22,9 +22,6 @@ PROTOCOL_NAME=goose -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = $(PROTOCOL_NAME).asn diff --git a/asn1/gprscdr/Makefile.common b/asn1/gprscdr/Makefile.common index 02a2b57ae0..262b03093a 100644 --- a/asn1/gprscdr/Makefile.common +++ b/asn1/gprscdr/Makefile.common @@ -22,9 +22,6 @@ PROTOCOL_NAME=gprscdr -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - EXPORT_FILES = \ $(PROTOCOL_NAME)-exp.cnf @@ -47,10 +44,10 @@ SRC_FILES = \ A2W_FLAGS= -b -e -EXTRA_CNF=../gsm_map/gsm_map-exp.cnf +EXTRA_CNF=$(builddir)/../gsm_map/gsm_map-exp.cnf -../gsm_map/gsm_map-exp.cnf: - (cd ../gsm_map && $(MAKE_CNF_EXPORT)) +$(builddir)/../gsm_map/gsm_map-exp.cnf: + (cd $(builddir)/../gsm_map && $(MAKE_CNF_EXPORT)) diff --git a/asn1/gsm_map/Makefile.common b/asn1/gsm_map/Makefile.common index 7276217b82..c296b38eb5 100644 --- a/asn1/gsm_map/Makefile.common +++ b/asn1/gsm_map/Makefile.common @@ -22,9 +22,6 @@ PROTOCOL_NAME=gsm_map -DISSECTOR_FILES=packet-gsm_map.c \ - packet-gsm_map.h - PROTO_OPT = EXPORT_FILES = \ diff --git a/asn1/h225/Makefile.common b/asn1/h225/Makefile.common index eac85846b5..c4f04c0fd2 100644 --- a/asn1/h225/Makefile.common +++ b/asn1/h225/Makefile.common @@ -22,11 +22,6 @@ PROTOCOL_NAME = h225 -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = \ $(PROTOCOL_NAME)-exp.cnf @@ -50,12 +45,12 @@ SRC_FILES = \ A2W_FLAGS= -e EXTRA_CNF = \ - ../h235/h235-exp.cnf \ - ../h245/h245-exp.cnf + $(builddir)/../h235/h235-exp.cnf \ + $(builddir)/../h245/h245-exp.cnf -../h235/h235-exp.cnf: - (cd ../h235 && $(MAKE_CNF_EXPORT)) +$(builddir)/../h235/h235-exp.cnf: + (cd $(builddir)/../h235 && $(MAKE_CNF_EXPORT)) -../h245/h245-exp.cnf: - (cd ../h245 && $(MAKE_CNF_EXPORT)) +$(builddir)/../h245/h245-exp.cnf: + (cd $(builddir)/../h245 && $(MAKE_CNF_EXPORT)) diff --git a/asn1/h235/Makefile.common b/asn1/h235/Makefile.common index 4bc2b2a27a..9fd06e4a49 100644 --- a/asn1/h235/Makefile.common +++ b/asn1/h235/Makefile.common @@ -22,11 +22,6 @@ PROTOCOL_NAME = h235 -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf EXT_ASN_FILE_LIST = @@ -51,9 +46,9 @@ SRC_FILES = \ A2W_FLAGS = -e EXTRA_CNF = \ - ../h225/h225-exp.cnf + $(builddir)/../h225/h225-exp.cnf -../h225/h225-exp.cnf: - (cd ../h225 && $(MAKE_CNF_EXPORT)) +$(builddir)/../h225/h225-exp.cnf: + (cd $(builddir)/../h225 && $(MAKE_CNF_EXPORT)) diff --git a/asn1/h245/Makefile.common b/asn1/h245/Makefile.common index af1cfac4f9..287a85310f 100644 --- a/asn1/h245/Makefile.common +++ b/asn1/h245/Makefile.common @@ -22,11 +22,6 @@ PROTOCOL_NAME = h245 -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = \ $(PROTOCOL_NAME)-exp.cnf diff --git a/asn1/h248/Makefile.common b/asn1/h248/Makefile.common index d41d59eeae..8ac3d8aa60 100644 --- a/asn1/h248/Makefile.common +++ b/asn1/h248/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=h248 -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = h248v3.asn \ diff --git a/asn1/h282/Makefile.common b/asn1/h282/Makefile.common index ff23af9e73..f8101120b5 100644 --- a/asn1/h282/Makefile.common +++ b/asn1/h282/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME = h282 -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ diff --git a/asn1/h283/Makefile.common b/asn1/h283/Makefile.common index 0f5ca7c0b9..bbca3d0705 100644 --- a/asn1/h283/Makefile.common +++ b/asn1/h283/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME = h283 -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ diff --git a/asn1/h323/Makefile.common b/asn1/h323/Makefile.common index 97ace01b12..f0244247e4 100644 --- a/asn1/h323/Makefile.common +++ b/asn1/h323/Makefile.common @@ -22,11 +22,6 @@ PROTOCOL_NAME = h323 -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ @@ -47,8 +42,8 @@ SRC_FILES = \ A2W_FLAGS = EXTRA_CNF = \ - ../h225/h225-exp.cnf + $(builddir)/../h225/h225-exp.cnf -../h225/h225-exp.cnf: - (cd ../h225 && $(MAKE_CNF_EXPORT)) +$(builddir)/../h225/h225-exp.cnf: + (cd $(builddir)/../h225 && $(MAKE_CNF_EXPORT)) diff --git a/asn1/h450-ros/Makefile.common b/asn1/h450-ros/Makefile.common index 8ca8d577c4..32c8cdaeb3 100644 --- a/asn1/h450-ros/Makefile.common +++ b/asn1/h450-ros/Makefile.common @@ -25,11 +25,6 @@ PROTOCOL_NAME = h450-ros # The file needs to use h450 for the filter elements etc PROTO_OPT = -p h450.ros -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf EXT_ASN_FILE_LIST = ../ros/Remote-Operations-Information-Objects.asn @@ -52,7 +47,7 @@ SRC_FILES = \ A2W_FLAGS= -e EXTRA_CNF = \ - ../ros/ros-inv.cnf \ - ../ros/ros-res.cnf \ - ../ros/ros-err.cnf \ - ../ros/ros-rej.cnf + $(builddir)/../ros/ros-inv.cnf \ + $(builddir)/../ros/ros-res.cnf \ + $(builddir)/../ros/ros-err.cnf \ + $(builddir)/../ros/ros-rej.cnf diff --git a/asn1/h450/Makefile.common b/asn1/h450/Makefile.common index d1cb57f637..922d851d74 100644 --- a/asn1/h450/Makefile.common +++ b/asn1/h450/Makefile.common @@ -22,8 +22,6 @@ PROTOCOL_NAME=h450 -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c - # need empty -p <proto> option, default is -p $(PROTOCOL_NAME) PROTO_OPT = @@ -67,12 +65,12 @@ SRC_FILES = \ A2W_FLAGS= EXTRA_CNF = \ - ../h225/h225-exp.cnf \ - ../h450-ros/h450-ros-exp.cnf + $(builddir)/../h225/h225-exp.cnf \ + $(builddir)/../h450-ros/h450-ros-exp.cnf -../h225/h225-exp.cnf: - (cd ../h225 && $(MAKE_CNF_EXPORT)) +$(builddir)/../h225/h225-exp.cnf: + (cd $(builddir)/../h225 && $(MAKE_CNF_EXPORT)) -../h450-ros/h450-ros-exp.cnf: - (cd ../h450-ros && $(MAKE_CNF_EXPORT)) +$(builddir)/../h450-ros/h450-ros-exp.cnf: + (cd $(builddir)/../h450-ros && $(MAKE_CNF_EXPORT)) diff --git a/asn1/h460/Makefile.common b/asn1/h460/Makefile.common index 96bc948e0e..f06eb7a503 100644 --- a/asn1/h460/Makefile.common +++ b/asn1/h460/Makefile.common @@ -21,10 +21,6 @@ PROTOCOL_NAME = h460 -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ @@ -54,15 +50,15 @@ PROTO_OPT = A2W_FLAGS = EXTRA_CNF = \ - ../h225/h225-exp.cnf \ - ../h235/h235-exp.cnf \ - ../h245/h245-exp.cnf + $(builddir)/../h225/h225-exp.cnf \ + $(builddir)/../h235/h235-exp.cnf \ + $(builddir)/../h245/h245-exp.cnf -../h225/h225-exp.cnf: - (cd ../h225 && $(MAKE_CNF_EXPORT)) +$(builddir)/../h225/h225-exp.cnf: + (cd $(builddir)/../h225 && $(MAKE_CNF_EXPORT)) -../h235/h235-exp.cnf: - (cd ../h235 && $(MAKE_CNF_EXPORT)) +$(builddir)/../h235/h235-exp.cnf: + (cd $(builddir)/../h235 && $(MAKE_CNF_EXPORT)) -../h245/h245-exp.cnf: - (cd ../h245 && $(MAKE_CNF_EXPORT)) +$(builddir)/../h245/h245-exp.cnf: + (cd $(builddir)/../h245 && $(MAKE_CNF_EXPORT)) diff --git a/asn1/h501/Makefile.common b/asn1/h501/Makefile.common index c913b434f7..f13dc12077 100644 --- a/asn1/h501/Makefile.common +++ b/asn1/h501/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME = h501 -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ @@ -44,12 +40,12 @@ SRC_FILES = \ A2W_FLAGS = EXTRA_CNF = \ - ../h225/h225-exp.cnf \ - ../h235/h235-exp.cnf + $(builddir)/../h225/h225-exp.cnf \ + $(builddir)/../h235/h235-exp.cnf -../h225/h225-exp.cnf: - (cd ../h225 && $(MAKE_CNF_EXPORT)) +$(builddir)/../h225/h225-exp.cnf: + (cd $(builddir)/../h225 && $(MAKE_CNF_EXPORT)) -../h235/h235-exp.cnf: - (cd ../h235 && $(MAKE_CNF_EXPORT)) +$(builddir)/../h235/h235-exp.cnf: + (cd $(builddir)/../h235 && $(MAKE_CNF_EXPORT)) diff --git a/asn1/hnbap/Makefile.common b/asn1/hnbap/Makefile.common index 203f5ceebc..a56b4c49e9 100644 --- a/asn1/hnbap/Makefile.common +++ b/asn1/hnbap/Makefile.common @@ -22,9 +22,6 @@ PROTOCOL_NAME = hnbap -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c - EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ diff --git a/asn1/idmp/Makefile.common b/asn1/idmp/Makefile.common index bb44b3ac63..7ad3b3409c 100644 --- a/asn1/idmp/Makefile.common +++ b/asn1/idmp/Makefile.common @@ -22,9 +22,6 @@ PROTOCOL_NAME=idmp -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - NEED_PACKET_PROTO_H = 1 EXPORT_FILES = \ @@ -52,8 +49,8 @@ SRC_FILES = \ A2W_FLAGS= -b -e -L EXTRA_CNF= \ - ../x509ce/x509ce-exp.cnf + $(builddir)/../x509ce/x509ce-exp.cnf -../x509ce/x509ce-exp.cnf: - (cd ../x509ce && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509ce/x509ce-exp.cnf: + (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT)) diff --git a/asn1/inap/Makefile.common b/asn1/inap/Makefile.common index f3024b9f26..684238bff5 100644 --- a/asn1/inap/Makefile.common +++ b/asn1/inap/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=inap -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf EXT_ASN_FILE_LIST_LATE = \ @@ -74,11 +70,11 @@ SRC_FILES = \ A2W_FLAGS= -b -e EXTRA_CNF= \ - ../dap/dap-exp.cnf \ - ../dsp/dsp-exp.cnf + $(builddir)/../dap/dap-exp.cnf \ + $(builddir)/../dsp/dsp-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)) diff --git a/asn1/kerberos/Makefile.am b/asn1/kerberos/Makefile.am index 462af31e88..ff7e8e6b15 100644 --- a/asn1/kerberos/Makefile.am +++ b/asn1/kerberos/Makefile.am @@ -22,5 +22,6 @@ include ../Makefile.preinc include Makefile.common -include ../Makefile.inc +# Comment this out to allow 'make all' to work +#include ../Makefile.inc diff --git a/asn1/kerberos/Makefile.common b/asn1/kerberos/Makefile.common index 2953988918..f12e47468a 100644 --- a/asn1/kerberos/Makefile.common +++ b/asn1/kerberos/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=kerberos -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = \ $(PROTOCOL_NAME)-exp.cnf diff --git a/asn1/ldap/Makefile.common b/asn1/ldap/Makefile.common index 3fc905132b..bb76799050 100644 --- a/asn1/ldap/Makefile.common +++ b/asn1/ldap/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=ldap -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf EXT_ASN_FILE_LIST = diff --git a/asn1/logotypecertextn/Makefile.common b/asn1/logotypecertextn/Makefile.common index f712e85eec..7bebb2ad91 100644 --- a/asn1/logotypecertextn/Makefile.common +++ b/asn1/logotypecertextn/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=logotypecertextn -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ @@ -47,8 +43,8 @@ SRC_FILES = \ A2W_FLAGS= -b EXTRA_CNF= \ - ../x509af/x509af-exp.cnf + $(builddir)/../x509af/x509af-exp.cnf -../x509af/x509af-exp.cnf: - (cd ../x509af && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509af/x509af-exp.cnf: + (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT)) diff --git a/asn1/lte-rrc/Makefile.common b/asn1/lte-rrc/Makefile.common index ae78ecf1d6..2df46fe634 100644 --- a/asn1/lte-rrc/Makefile.common +++ b/asn1/lte-rrc/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME = lte-rrc -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf EXT_ASN_FILE_LIST = diff --git a/asn1/mms/Makefile.common b/asn1/mms/Makefile.common index f4307c7aff..43da1bfd4a 100644 --- a/asn1/mms/Makefile.common +++ b/asn1/mms/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=mms -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = $(PROTOCOL_NAME).asn @@ -46,8 +42,8 @@ SRC_FILES = \ A2W_FLAGS= -b EXTRA_CNF= \ - ../acse/acse-exp.cnf + $(builddir)/../acse/acse-exp.cnf -../acse/acse-exp.cnf: - (cd ../acse && $(MAKE_CNF_EXPORT)) +$(builddir)/../acse/acse-exp.cnf: + (cd $(builddir)/../acse && $(MAKE_CNF_EXPORT)) diff --git a/asn1/mpeg-audio/Makefile.common b/asn1/mpeg-audio/Makefile.common index 18fdeadd3b..9accb6741b 100644 --- a/asn1/mpeg-audio/Makefile.common +++ b/asn1/mpeg-audio/Makefile.common @@ -22,9 +22,6 @@ PROTOCOL_NAME=mpeg-audio -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = $(PROTOCOL_NAME).asn diff --git a/asn1/mpeg-pes/Makefile.common b/asn1/mpeg-pes/Makefile.common index 54eda966aa..193bd431a7 100644 --- a/asn1/mpeg-pes/Makefile.common +++ b/asn1/mpeg-pes/Makefile.common @@ -22,9 +22,6 @@ PROTOCOL_NAME=mpeg-pes -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = $(PROTOCOL_NAME).asn diff --git a/asn1/nbap/Makefile.common b/asn1/nbap/Makefile.common index a066983aa9..4206c9bfbb 100644 --- a/asn1/nbap/Makefile.common +++ b/asn1/nbap/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME = nbap -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ diff --git a/asn1/ns_cert_exts/Makefile.common b/asn1/ns_cert_exts/Makefile.common index 165338ef0c..9897c4a573 100644 --- a/asn1/ns_cert_exts/Makefile.common +++ b/asn1/ns_cert_exts/Makefile.common @@ -22,8 +22,6 @@ PROTOCOL_NAME=ns_cert_exts -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c - EXT_ASN_FILE_LIST = ASN_FILE_LIST = NETSCAPE-CERT-EXTS.asn diff --git a/asn1/ocsp/Makefile.common b/asn1/ocsp/Makefile.common index 23a8d9ff89..dcb71b330e 100644 --- a/asn1/ocsp/Makefile.common +++ b/asn1/ocsp/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=ocsp -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = OCSP.asn @@ -46,12 +42,12 @@ SRC_FILES = \ A2W_FLAGS= -b EXTRA_CNF= \ - ../x509af/x509af-exp.cnf \ - ../x509ce/x509ce-exp.cnf + $(builddir)/../x509af/x509af-exp.cnf \ + $(builddir)/../x509ce/x509ce-exp.cnf -../x509af/x509af-exp.cnf: - (cd ../x509af && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509af/x509af-exp.cnf: + (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT)) -../x509ce/x509ce-exp.cnf: - (cd ../x509ce && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509ce/x509ce-exp.cnf: + (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT)) diff --git a/asn1/p1/Makefile.common b/asn1/p1/Makefile.common index 9dfc1ba1dc..356780a412 100644 --- a/asn1/p1/Makefile.common +++ b/asn1/p1/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=p1 -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf EXT_ASN_FILE_LIST = @@ -49,27 +45,27 @@ SRC_FILES = \ A2W_FLAGS= -b -e -C EXTRA_CNF= \ - ../x509af/x509af-exp.cnf \ - ../x509ce/x509ce-exp.cnf \ - ../x509if/x509if-exp.cnf \ - ../x509sat/x509sat-exp.cnf \ - ../ros/ros-exp.cnf \ - ../rtse/rtse-exp.cnf + $(builddir)/../x509af/x509af-exp.cnf \ + $(builddir)/../x509ce/x509ce-exp.cnf \ + $(builddir)/../x509if/x509if-exp.cnf \ + $(builddir)/../x509sat/x509sat-exp.cnf \ + $(builddir)/../ros/ros-exp.cnf \ + $(builddir)/../rtse/rtse-exp.cnf -../x509af/x509af-exp.cnf: - (cd ../x509af && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509af/x509af-exp.cnf: + (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT)) -../x509ce/x509ce-exp.cnf: - (cd ../x509ce && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509ce/x509ce-exp.cnf: + (cd $(builddir)/../x509ce && $(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)) -../ros/ros-exp.cnf: - (cd ../ros && $(MAKE_CNF_EXPORT)) +$(builddir)/../ros/ros-exp.cnf: + (cd $(builddir)/../ros && $(MAKE_CNF_EXPORT)) -../rtse/rtse-exp.cnf: - (cd ../rtse && $(MAKE_CNF_EXPORT)) +$(builddir)/../rtse/rtse-exp.cnf: + (cd $(builddir)/../rtse && $(MAKE_CNF_EXPORT)) diff --git a/asn1/p22/Makefile.common b/asn1/p22/Makefile.common index 3864321efa..cc2ea7048d 100644 --- a/asn1/p22/Makefile.common +++ b/asn1/p22/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=p22 -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf EXT_ASN_FILE_LIST = @@ -58,28 +54,28 @@ SRC_FILES = \ A2W_FLAGS= -b -e -C EXTRA_CNF= \ - ../acse/acse-exp.cnf \ - ../ftam/ftam-exp.cnf \ - ../p7/p7-exp.cnf \ - ../p1/p1-exp.cnf \ - ../x509af/x509af-exp.cnf \ - ../x509ce/x509ce-exp.cnf + $(builddir)/../acse/acse-exp.cnf \ + $(builddir)/../ftam/ftam-exp.cnf \ + $(builddir)/../p7/p7-exp.cnf \ + $(builddir)/../p1/p1-exp.cnf \ + $(builddir)/../x509af/x509af-exp.cnf \ + $(builddir)/../x509ce/x509ce-exp.cnf -../acse/acse-exp.cnf: - (cd ../acse && $(MAKE_CNF_EXPORT)) +$(builddir)/../acse/acse-exp.cnf: + (cd $(builddir)/../acse && $(MAKE_CNF_EXPORT)) -../ftam/ftam-exp.cnf: - (cd ../ftam && $(MAKE_CNF_EXPORT)) +$(builddir)/../ftam/ftam-exp.cnf: + (cd $(builddir)/../ftam && $(MAKE_CNF_EXPORT)) -../p7/p7-exp.cnf: - (cd ../p7 && $(MAKE_CNF_EXPORT)) +$(builddir)/../p7/p7-exp.cnf: + (cd $(builddir)/../p7 && $(MAKE_CNF_EXPORT)) -../p1/p1-exp.cnf: - (cd ../p1 && $(MAKE_CNF_EXPORT)) +$(builddir)/../p1/p1-exp.cnf: + (cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT)) -../x509af/x509af-exp.cnf: - (cd ../x509af && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509af/x509af-exp.cnf: + (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT)) -../x509ce/x509ce-exp.cnf: - (cd ../x509ce && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509ce/x509ce-exp.cnf: + (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT)) diff --git a/asn1/p7/Makefile.common b/asn1/p7/Makefile.common index 430366c62f..feac989e95 100644 --- a/asn1/p7/Makefile.common +++ b/asn1/p7/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=p7 -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = \ $(PROTOCOL_NAME)-exp.cnf @@ -53,16 +49,16 @@ SRC_FILES = \ A2W_FLAGS= -b -e -L -C EXTRA_CNF= \ - ../p1/p1-exp.cnf \ - ../ros/ros-exp.cnf \ - ../rtse/rtse.cnf + $(builddir)/../p1/p1-exp.cnf \ + $(builddir)/../ros/ros-exp.cnf \ + $(builddir)/../rtse/rtse.cnf -../p1/p1-exp.cnf: - (cd ../p1 && $(MAKE_CNF_EXPORT)) +$(builddir)/../p1/p1-exp.cnf: + (cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT)) -../ros/ros-exp.cnf: - (cd ../ros && $(MAKE_CNF_EXPORT)) +$(builddir)/../ros/ros-exp.cnf: + (cd $(builddir)/../ros && $(MAKE_CNF_EXPORT)) -../rtse/rtse-exp.cnf: - (cd ../rtse && $(MAKE_CNF_EXPORT)) +$(builddir)/../rtse/rtse-exp.cnf: + (cd $(builddir)/../rtse && $(MAKE_CNF_EXPORT)) diff --git a/asn1/p772/Makefile.common b/asn1/p772/Makefile.common index 32eb5b38ab..f345e5c386 100644 --- a/asn1/p772/Makefile.common +++ b/asn1/p772/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=p772 -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = MMSAbstractService.asn MMSInformationObjects.asn \ @@ -50,12 +46,12 @@ SRC_FILES = \ A2W_FLAGS= -b -e -C EXTRA_CNF= \ - ../p1/p1-exp.cnf \ - ../p22/p22-exp.cnf + $(builddir)/../p1/p1-exp.cnf \ + $(builddir)/../p22/p22-exp.cnf -../p1/p1-exp.cnf: - (cd ../p1 && $(MAKE_CNF_EXPORT)) +$(builddir)/../p1/p1-exp.cnf: + (cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT)) -../p22/p22-exp.cnf: - (cd ../p22 && $(MAKE_CNF_EXPORT)) +$(builddir)/../p22/p22-exp.cnf: + (cd $(builddir)/../p22 && $(MAKE_CNF_EXPORT)) diff --git a/asn1/pcap/Makefile.common b/asn1/pcap/Makefile.common index e3743d79cd..129a22d14e 100644 --- a/asn1/pcap/Makefile.common +++ b/asn1/pcap/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME = pcap -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ diff --git a/asn1/pkcs1/Makefile.common b/asn1/pkcs1/Makefile.common index 146352a8c2..930df2e43d 100644 --- a/asn1/pkcs1/Makefile.common +++ b/asn1/pkcs1/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=pkcs1 -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = PKIXAlgs-2009.asn @@ -46,8 +42,8 @@ SRC_FILES = \ A2W_FLAGS= -b EXTRA_CNF= \ - ../x509af/x509af-exp.cnf + $(builddir)/../x509af/x509af-exp.cnf -../x509af/x509af-exp.cnf: - (cd ../x509af && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509af/x509af-exp.cnf: + (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT)) diff --git a/asn1/pkcs12/Makefile.common b/asn1/pkcs12/Makefile.common index 7bcb22af22..2bf70bd2bc 100644 --- a/asn1/pkcs12/Makefile.common +++ b/asn1/pkcs12/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=pkcs12 -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = $(PROTOCOL_NAME).asn @@ -47,16 +43,16 @@ A2W_FLAGS= -b -e # Note the order here is important, cms needs at least x509af-exp to be generated first EXTRA_CNF= \ - ../x509if/x509if-exp.cnf \ - ../x509af/x509af-exp.cnf \ - ../cms/cms-exp.cnf + $(builddir)/../x509if/x509if-exp.cnf \ + $(builddir)/../x509af/x509af-exp.cnf \ + $(builddir)/../cms/cms-exp.cnf -../cms/cms-exp.cnf: - (cd ../cms && $(MAKE_CNF_EXPORT)) +$(builddir)/../cms/cms-exp.cnf: + (cd $(builddir)/../cms && $(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)) diff --git a/asn1/pkinit/Makefile.common b/asn1/pkinit/Makefile.common index af3ede72bf..1eef74492c 100644 --- a/asn1/pkinit/Makefile.common +++ b/asn1/pkinit/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=pkinit -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = PKINIT.asn @@ -46,8 +42,8 @@ SRC_FILES = \ A2W_FLAGS= -b EXTRA_CNF= \ - ../cms/cms-exp.cnf + $(builddir)/../cms/cms-exp.cnf -../cms/cms-exp.cnf: - (cd ../cms && $(MAKE_CNF_EXPORT)) +$(builddir)/../cms/cms-exp.cnf: + (cd $(builddir)/../cms && $(MAKE_CNF_EXPORT)) diff --git a/asn1/pkix1explicit/Makefile.common b/asn1/pkix1explicit/Makefile.common index fec1f332f6..6fe8fe9313 100644 --- a/asn1/pkix1explicit/Makefile.common +++ b/asn1/pkix1explicit/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=pkix1explicit -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = PKIX1EXPLICIT93.asn \ diff --git a/asn1/pkix1implicit/Makefile.common b/asn1/pkix1implicit/Makefile.common index fbd64ed060..76f0c57a03 100644 --- a/asn1/pkix1implicit/Makefile.common +++ b/asn1/pkix1implicit/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=pkix1implicit -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = PKIX1IMPLICIT93.asn @@ -47,8 +43,8 @@ SRC_FILES = \ A2W_FLAGS= -b EXTRA_CNF= \ - ../x509ce/x509ce-exp.cnf + $(builddir)/../x509ce/x509ce-exp.cnf -../x509ce/x509ce-exp.cnf: - (cd ../x509ce && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509ce/x509ce-exp.cnf: + (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT)) diff --git a/asn1/pkixac/Makefile.common b/asn1/pkixac/Makefile.common index b333f9f1f5..7021ddf3b4 100644 --- a/asn1/pkixac/Makefile.common +++ b/asn1/pkixac/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=pkixac -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = PKIXAttributeCertificate.asn @@ -46,16 +42,16 @@ SRC_FILES = \ A2W_FLAGS= -b EXTRA_CNF= \ - ../pkix1explicit/pkix1explicit_exp.cnf \ - ../pkix1implicit/pkix1implicit_exp.cnf \ - ../x509ce/x509ce-exp.cnf + $(builddir)/../pkix1explicit/pkix1explicit_exp.cnf \ + $(builddir)/../pkix1implicit/pkix1implicit_exp.cnf \ + $(builddir)/../x509ce/x509ce-exp.cnf -../pkix1explicit/pkix1explicit_exp.cnf: - (cd ../pkix1explicit && $(MAKE_CNF_EXPORT)) +$(builddir)/../pkix1explicit/pkix1explicit_exp.cnf: + (cd $(builddir)/../pkix1explicit && $(MAKE_CNF_EXPORT)) -../pkix1implicit/pkix1implicit_exp.cnf: - (cd ../pkix1implicit && $(MAKE_CNF_EXPORT)) +$(builddir)/../pkix1implicit/pkix1implicit_exp.cnf: + (cd $(builddir)/../pkix1implicit && $(MAKE_CNF_EXPORT)) -../x509ce/x509ce-exp.cnf: - (cd ../x509ce && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509ce/x509ce-exp.cnf: + (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT)) diff --git a/asn1/pkixproxy/Makefile.common b/asn1/pkixproxy/Makefile.common index 2b1147e16c..8860179aca 100644 --- a/asn1/pkixproxy/Makefile.common +++ b/asn1/pkixproxy/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=pkixproxy -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = PKIXProxy.asn diff --git a/asn1/pkixqualified/Makefile.common b/asn1/pkixqualified/Makefile.common index 6e65099b8c..44a0c5a642 100644 --- a/asn1/pkixqualified/Makefile.common +++ b/asn1/pkixqualified/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=pkixqualified -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = PKIXqualified.asn @@ -46,16 +42,16 @@ SRC_FILES = \ A2W_FLAGS= -b EXTRA_CNF= \ - ../x509af/x509af-exp.cnf \ - ../x509ce/x509ce-exp.cnf \ - ../x509sat/x509sat-exp.cnf + $(builddir)/../x509af/x509af-exp.cnf \ + $(builddir)/../x509ce/x509ce-exp.cnf \ + $(builddir)/../x509sat/x509sat-exp.cnf -../x509af/x509af-exp.cnf: - (cd ../x509af && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509af/x509af-exp.cnf: + (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT)) -../x509ce/x509ce-exp.cnf: - (cd ../x509ce && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509ce/x509ce-exp.cnf: + (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT)) -../x509sat/x509sat-exp.cnf: - (cd ../x509sat && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509sat/x509sat-exp.cnf: + (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT)) diff --git a/asn1/pkixtsp/Makefile.common b/asn1/pkixtsp/Makefile.common index 56ce6078e5..a08a10a25f 100644 --- a/asn1/pkixtsp/Makefile.common +++ b/asn1/pkixtsp/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=pkixtsp -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = PKIXTSP.asn @@ -46,8 +42,8 @@ SRC_FILES = \ A2W_FLAGS= -b EXTRA_CNF= \ - ../cms/cms-exp.cnf + $(builddir)/../cms/cms-exp.cnf -../cms/cms-exp.cnf: - (cd ../cms && $(MAKE_CNF_EXPORT)) +$(builddir)/../cms/cms-exp.cnf: + (cd $(builddir)/../cms && $(MAKE_CNF_EXPORT)) diff --git a/asn1/pres/Makefile.common b/asn1/pres/Makefile.common index 227e8cbc89..f8264ffd45 100644 --- a/asn1/pres/Makefile.common +++ b/asn1/pres/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=pres -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = ISO8823-PRESENTATION.asn ISO9576-PRESENTATION.asn @@ -46,8 +42,8 @@ SRC_FILES = \ A2W_FLAGS= -b EXTRA_CNF= \ - ../rtse/rtse-exp.cnf + $(builddir)/../rtse/rtse-exp.cnf -../rtse/rtse-exp.cnf: - (cd ../rtse && $(MAKE_CNF_EXPORT)) +$(builddir)/../rtse/rtse-exp.cnf: + (cd $(builddir)/../rtse && $(MAKE_CNF_EXPORT)) diff --git a/asn1/q932-ros/Makefile.common b/asn1/q932-ros/Makefile.common index 297100e1c0..34d20db608 100644 --- a/asn1/q932-ros/Makefile.common +++ b/asn1/q932-ros/Makefile.common @@ -22,8 +22,6 @@ PROTOCOL_NAME=q932-ros -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c - PROTO_OPT = -p q932.ros @@ -47,8 +45,8 @@ SRC_FILES = \ A2W_FLAGS= -b EXTRA_CNF = \ - ../ros/ros-inv.cnf \ - ../ros/ros-res.cnf \ - ../ros/ros-err.cnf \ - ../ros/ros-rej.cnf + $(builddir)/../ros/ros-inv.cnf \ + $(builddir)/../ros/ros-res.cnf \ + $(builddir)/../ros/ros-err.cnf \ + $(builddir)/../ros/ros-rej.cnf diff --git a/asn1/q932/Makefile.common b/asn1/q932/Makefile.common index 82e39de9ae..8b1d901d2d 100644 --- a/asn1/q932/Makefile.common +++ b/asn1/q932/Makefile.common @@ -22,11 +22,6 @@ PROTOCOL_NAME = q932 -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf EXT_ASN_FILE_LIST = diff --git a/asn1/qsig/Makefile.common b/asn1/qsig/Makefile.common index fac7ca3e8b..2026fb71cc 100644 --- a/asn1/qsig/Makefile.common +++ b/asn1/qsig/Makefile.common @@ -22,11 +22,6 @@ PROTOCOL_NAME = qsig -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf EXT_ASN_FILE_LIST = diff --git a/asn1/ranap/Makefile.common b/asn1/ranap/Makefile.common index 17be27f3a1..d4d65c1f01 100644 --- a/asn1/ranap/Makefile.common +++ b/asn1/ranap/Makefile.common @@ -22,11 +22,6 @@ PROTOCOL_NAME = ranap -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ diff --git a/asn1/rnsap/Makefile.common b/asn1/rnsap/Makefile.common index 092d8da7d4..651373a69e 100644 --- a/asn1/rnsap/Makefile.common +++ b/asn1/rnsap/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME = rnsap -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ diff --git a/asn1/ros/Makefile.common b/asn1/ros/Makefile.common index d31ce22186..70340bed7f 100644 --- a/asn1/ros/Makefile.common +++ b/asn1/ros/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=ros -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf EXT_ASN_FILE_LIST = diff --git a/asn1/rrc/Makefile.common b/asn1/rrc/Makefile.common index 5972312929..e324487c4a 100644 --- a/asn1/rrc/Makefile.common +++ b/asn1/rrc/Makefile.common @@ -22,11 +22,6 @@ PROTOCOL_NAME = rrc -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ diff --git a/asn1/rrlp/Makefile.common b/asn1/rrlp/Makefile.common index 19efca6f5c..d0070bc4b8 100644 --- a/asn1/rrlp/Makefile.common +++ b/asn1/rrlp/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME = rrlp -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c - - EXT_ASN_FILE_LIST = \ ../gsm_map/MAP-ExtensionDataTypes.asn \ ../gsm_map/MAP-LCS-DataTypes.asn diff --git a/asn1/rtse/Makefile.common b/asn1/rtse/Makefile.common index af7cba3082..1515117bb1 100644 --- a/asn1/rtse/Makefile.common +++ b/asn1/rtse/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=rtse -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf EXT_ASN_FILE_LIST = diff --git a/asn1/rua/Makefile.common b/asn1/rua/Makefile.common index 3ca0281315..ad919e2434 100644 --- a/asn1/rua/Makefile.common +++ b/asn1/rua/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME = rua -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ diff --git a/asn1/s1ap/Makefile.common b/asn1/s1ap/Makefile.common index 6cb65ad7bb..01e78ed460 100644 --- a/asn1/s1ap/Makefile.common +++ b/asn1/s1ap/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME = s1ap -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf EXT_ASN_FILE_LIST = diff --git a/asn1/sabp/Makefile.common b/asn1/sabp/Makefile.common index ed8e89a105..75064f61a3 100644 --- a/asn1/sabp/Makefile.common +++ b/asn1/sabp/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME = sabp -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ diff --git a/asn1/smrse/Makefile.common b/asn1/smrse/Makefile.common index 2ca105f9ea..df8616e0b0 100644 --- a/asn1/smrse/Makefile.common +++ b/asn1/smrse/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=smrse -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = SMRSE.asn diff --git a/asn1/snmp/Makefile.common b/asn1/snmp/Makefile.common index f5e8c995f9..a14fd4c1e7 100644 --- a/asn1/snmp/Makefile.common +++ b/asn1/snmp/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=snmp -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = $(PROTOCOL_NAME).asn diff --git a/asn1/spnego/Makefile.common b/asn1/spnego/Makefile.common index 7b1fd996d7..ddfa2c9e35 100644 --- a/asn1/spnego/Makefile.common +++ b/asn1/spnego/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=spnego -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = $(PROTOCOL_NAME).asn diff --git a/asn1/sv/Makefile.common b/asn1/sv/Makefile.common index 5bc2fd2db1..4c83315b84 100644 --- a/asn1/sv/Makefile.common +++ b/asn1/sv/Makefile.common @@ -22,11 +22,6 @@ PROTOCOL_NAME=sv -DISSECTOR_FILES= \ - packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = $(PROTOCOL_NAME).asn diff --git a/asn1/t124/Makefile.am b/asn1/t124/Makefile.am index 462af31e88..33a94fe030 100644 --- a/asn1/t124/Makefile.am +++ b/asn1/t124/Makefile.am @@ -24,3 +24,5 @@ include ../Makefile.preinc include Makefile.common include ../Makefile.inc +MCS-PROTOCOL.asn: ../t125/MCS-PROTOCOL.asn + cp $< $(srcdir)/$@ diff --git a/asn1/t124/Makefile.common b/asn1/t124/Makefile.common index af4c36ebf9..f3996a66bf 100644 --- a/asn1/t124/Makefile.common +++ b/asn1/t124/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=t124 -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = GCC-PROTOCOL.asn MCS-PROTOCOL.asn @@ -45,7 +41,4 @@ SRC_FILES = \ A2W_FLAGS= -EXTRA_CNF= - -MCS-PROTOCOL.asn: ../t125/MCS-PROTOCOL.asn - cp $< $@
\ No newline at end of file +EXTRA_CNF=
\ No newline at end of file diff --git a/asn1/t124/Makefile.nmake b/asn1/t124/Makefile.nmake index 5a32997c60..af53cbc544 100644 --- a/asn1/t124/Makefile.nmake +++ b/asn1/t124/Makefile.nmake @@ -27,3 +27,5 @@ include ../Makefile.preinc.nmake include Makefile.common include ../Makefile.inc.nmake +MCS-PROTOCOL.asn: ../t125/MCS-PROTOCOL.asn + cp $< $@ diff --git a/asn1/t125/Makefile.common b/asn1/t125/Makefile.common index 930bf6da34..8f144d2be8 100644 --- a/asn1/t125/Makefile.common +++ b/asn1/t125/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=t125 -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = MCS-PROTOCOL.asn diff --git a/asn1/t38/Makefile.common b/asn1/t38/Makefile.common index daf24f5baf..113a076743 100644 --- a/asn1/t38/Makefile.common +++ b/asn1/t38/Makefile.common @@ -22,11 +22,6 @@ PROTOCOL_NAME = t38 -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ diff --git a/asn1/tcap/Makefile.common b/asn1/tcap/Makefile.common index 397d01a10a..75edb5aaa8 100644 --- a/asn1/tcap/Makefile.common +++ b/asn1/tcap/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=tcap -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = $(PROTOCOL_NAME).asn\ diff --git a/asn1/tetra/Makefile.common b/asn1/tetra/Makefile.common index 10360b1916..ef7f3d3878 100644 --- a/asn1/tetra/Makefile.common +++ b/asn1/tetra/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=tetra -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = tetra.asn diff --git a/asn1/ulp/Makefile.common b/asn1/ulp/Makefile.common index 3616664292..319e999ac4 100644 --- a/asn1/ulp/Makefile.common +++ b/asn1/ulp/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME = ulp -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ diff --git a/asn1/wlancertextn/Makefile.common b/asn1/wlancertextn/Makefile.common index d92e6c044d..caadf84d9c 100644 --- a/asn1/wlancertextn/Makefile.common +++ b/asn1/wlancertextn/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=wlancertextn -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = WLANCERTEXTN.asn diff --git a/asn1/x2ap/Makefile.common b/asn1/x2ap/Makefile.common index fae0ca03b8..eee1e54a75 100644 --- a/asn1/x2ap/Makefile.common +++ b/asn1/x2ap/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME = x2ap -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c - - EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ diff --git a/asn1/x509af/Makefile.common b/asn1/x509af/Makefile.common index af5f19666d..2ffe143e77 100644 --- a/asn1/x509af/Makefile.common +++ b/asn1/x509af/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=x509af -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf EXT_ASN_FILE_LIST = @@ -48,16 +44,16 @@ SRC_FILES = \ A2W_FLAGS= -b -e EXTRA_CNF= \ - ../x509ce/x509ce-exp.cnf \ - ../x509if/x509if-exp.cnf \ - ../x509sat/x509sat-exp.cnf + $(builddir)/../x509ce/x509ce-exp.cnf \ + $(builddir)/../x509if/x509if-exp.cnf \ + $(builddir)/../x509sat/x509sat-exp.cnf -../x509ce/x509ce-exp.cnf: - (cd ../x509ce && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509ce/x509ce-exp.cnf: + (cd $(builddir)/../x509ce && $(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)) diff --git a/asn1/x509ce/Makefile.common b/asn1/x509ce/Makefile.common index 9fb9146219..ebd14e9a6c 100644 --- a/asn1/x509ce/Makefile.common +++ b/asn1/x509ce/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=x509ce -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf EXT_ASN_FILE_LIST = @@ -48,20 +44,20 @@ SRC_FILES = \ A2W_FLAGS= -b -e EXTRA_CNF= \ - ../p1/p1-exp.cnf \ - ../x509af/x509af-exp.cnf \ - ../x509if/x509if-exp.cnf \ - ../x509sat/x509sat-exp.cnf + $(builddir)/../p1/p1-exp.cnf \ + $(builddir)/../x509af/x509af-exp.cnf \ + $(builddir)/../x509if/x509if-exp.cnf \ + $(builddir)/../x509sat/x509sat-exp.cnf -../p1/p1-exp.cnf: - (cd ../p1 && $(MAKE_CNF_EXPORT)) +$(builddir)/../p1/p1-exp.cnf: + (cd $(builddir)/../p1 && $(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)) diff --git a/asn1/x509if/Makefile.common b/asn1/x509if/Makefile.common index 4f5170b3fd..04d749590a 100644 --- a/asn1/x509if/Makefile.common +++ b/asn1/x509if/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=x509if -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = \ $(PROTOCOL_NAME)-exp.cnf @@ -49,8 +45,8 @@ SRC_FILES = \ A2W_FLAGS= -b -e EXTRA_CNF= \ - ../x509sat/x509sat-exp.cnf + $(builddir)/../x509sat/x509sat-exp.cnf -../x509sat/x509sat-exp.cnf: - (cd ../x509sat && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509sat/x509sat-exp.cnf: + (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT)) diff --git a/asn1/x509sat/Makefile.common b/asn1/x509sat/Makefile.common index 9e42fd87b5..fc1da9261e 100644 --- a/asn1/x509sat/Makefile.common +++ b/asn1/x509sat/Makefile.common @@ -22,10 +22,6 @@ PROTOCOL_NAME=x509sat -DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ - packet-$(PROTOCOL_NAME).h - - EXPORT_FILES = \ $(PROTOCOL_NAME)-exp.cnf @@ -49,12 +45,12 @@ SRC_FILES = \ A2W_FLAGS= -b -e -r Syntax EXTRA_CNF= \ - ../x509if/x509if-exp.cnf \ - ../p1/p1-exp.cnf + $(builddir)/../x509if/x509if-exp.cnf \ + $(builddir)/../p1/p1-exp.cnf -../x509if/x509if-exp.cnf: - (cd ../x509if && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509if/x509if-exp.cnf: + (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT)) -../p1/p1-exp.cnf: - (cd ../p1 && $(MAKE_CNF_EXPORT)) +$(builddir)/../p1/p1-exp.cnf: + (cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT)) diff --git a/asn1/x721/Makefile.am b/asn1/x721/Makefile.am index 462af31e88..c179c02a28 100644 --- a/asn1/x721/Makefile.am +++ b/asn1/x721/Makefile.am @@ -19,8 +19,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - include ../Makefile.preinc include Makefile.common -include ../Makefile.inc +# Comment this out to allow 'make all' to work +#include ../Makefile.inc diff --git a/asn1/x721/Makefile.common b/asn1/x721/Makefile.common index 9b4378657e..34777e47e2 100644 --- a/asn1/x721/Makefile.common +++ b/asn1/x721/Makefile.common @@ -22,9 +22,6 @@ #Dummy entry to pass the clean target PROTOCOL_NAME = dummy -DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c - EXTRA_DIST = \ Attribute-ASN1Module.asn \ ManagedObjectClassesDefinitions.asn \ diff --git a/tools/asn2wrs.py b/tools/asn2wrs.py index 0d3f2fa6bd..18fe4d12bf 100755 --- a/tools/asn2wrs.py +++ b/tools/asn2wrs.py @@ -567,8 +567,8 @@ def rel_dissector_path(filename): path_parts.pop(0) path_parts.insert(0, '..') path_parts.insert(0, '..') - return '/'.join(path_parts) - + return '/'.join(path_parts) + #--- EthCtx ------------------------------------------------------------------- class EthCtx: @@ -1394,7 +1394,7 @@ class EthCtx: out += ' { %3s, "%s" },\n' % (vval, id) out += " { 0, NULL }\n};\n" if (use_ext): - out += "\nstatic value_string_ext %s_ext = VALUE_STRING_EXT_INIT(%s);\n" % (self.eth_vals_nm(tname), self.eth_vals_nm(tname)) + out += "\nstatic value_string_ext %s_ext = VALUE_STRING_EXT_INIT(%s);\n" % (self.eth_vals_nm(tname), self.eth_vals_nm(tname)) return out #--- eth_enum_prefix ------------------------------------------------------------ @@ -2817,12 +2817,9 @@ class EthOut: fn += '-' + ftype fn += '.' + ext return fn - #--- output_fullname ------------------------------------------------------- - def output_fullname(self, ftype, ext='c'): - return os.path.join(self.outdir, self.output_fname(ftype, ext=ext)) #--- file_open ------------------------------------------------------- def file_open(self, ftype, ext='c'): - fn = self.output_fullname(ftype, ext=ext) + fn = self.output_fname(ftype, ext=ext) if self.created_file_exists(fn): fx = file(fn, 'a') else: @@ -2877,11 +2874,11 @@ class EthOut: def make_single_file(self): if (not self.single_file): return in_nm = self.single_file + '.c' - out_nm = self.output_fullname('') + out_nm = os.path.join(self.outdir, self.output_fname('')) self.do_include(out_nm, in_nm) in_nm = self.single_file + '.h' if (os.path.exists(in_nm)): - out_nm = self.output_fullname('', ext='h') + out_nm = os.path.join(self.outdir, self.output_fname('', ext='h')) self.do_include(out_nm, in_nm) if (not self.keep): for fn in self.created_files_ord: @@ -3938,7 +3935,7 @@ class SeqType (SqType): if isinstance(e.val, ExtensionAdditionGroup): e.val.parent_ident = ident e.val.parent_tname = ectx.type[ident]['tname'] - if (e.val.ver): + if (e.val.ver): e.val.SetName("eag_v%s" % (e.val.ver)) else: e.val.SetName("eag_%d" % (eag_num)) @@ -7765,7 +7762,7 @@ asn2wrs [-h|?] [-d dbg] [-b] [-p proto] [-c cnf_file] [-e] input_file(s) ... -p proto : Protocol name (implies -S). Default is module-name from input_file (renamed by #.MODULE if present) -o name : Output files name core (default is <proto>) - -O dir : Output directory + -O dir : Output directory for dissector -c cnf_file : Conformance file -I path : Path for conformance file includes -e : Create conformance file for exported types @@ -7778,7 +7775,7 @@ asn2wrs [-h|?] [-d dbg] [-b] [-p proto] [-c cnf_file] [-e] input_file(s) ... -D dir : Directory for input_file(s) (default: '.') -C : Add check for SIZE constraints -r prefix : Remove the prefix from type names - + input_file(s) : Input ASN.1 file(s) -d dbg : Debug output, dbg = [l][y][p][s][a][t][c][m][o] |