From 791d93a2594611ba44725ecf8338eb2785021c19 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 30 Jul 2014 21:30:41 -0700 Subject: [PATCH] Add more files to the distribution. If it's checked into asn1 or a subdirectory thereof, put it into the distribution. (If it's not useful, why is it in Git?) Change-Id: I4dac8a0d19a770db1513729cf71069a37f1d83fc Reviewed-on: https://code.wireshark.org/review/3276 Reviewed-by: Guy Harris --- asn1/camel/Makefile.common | 7 +++++-- asn1/cmip/Makefile.common | 4 ++++ asn1/gnm/Makefile.common | 4 ++++ asn1/gprscdr/Makefile.common | 11 +++++++++++ asn1/gsm_map/Makefile.common | 5 +++++ asn1/h248/Makefile.common | 4 ++++ asn1/inap/Makefile.common | 4 ++++ asn1/isdn-sup/Makefile.common | 10 ++++++++++ asn1/kerberos/Makefile.common | 1 + asn1/lpp/Makefile.common | 1 + asn1/ros/Makefile.common | 19 +++++++++++-------- asn1/t38/Makefile.common | 4 ++++ asn1/tcap/Makefile.common | 9 ++++++--- asn1/x721/Makefile.common | 7 +++++++ 14 files changed, 77 insertions(+), 13 deletions(-) diff --git a/asn1/camel/Makefile.common b/asn1/camel/Makefile.common index ca8a717f90..d2203a1b92 100644 --- a/asn1/camel/Makefile.common +++ b/asn1/camel/Makefile.common @@ -38,16 +38,19 @@ ASN_FILE_LIST = \ CAP-U-ABORT-Data.asn \ CamelV2diff.asn +INCLUDED_ASN_FILE_LIST = \ + TCAPMessages.asn + # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ + $(INCLUDED_ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ $(PROTOCOL_NAME).asn \ - $(PROTOCOL_NAME).cnf \ - TCAPMessages.asn + $(PROTOCOL_NAME).cnf SRC_FILES = \ $(EXTRA_DIST) \ diff --git a/asn1/cmip/Makefile.common b/asn1/cmip/Makefile.common index 45d7a34ed2..d80015e6de 100644 --- a/asn1/cmip/Makefile.common +++ b/asn1/cmip/Makefile.common @@ -32,11 +32,15 @@ ASN_FILE_LIST = \ CMIP-A-ABORT-Information.asn \ CMIP-A-ASSOCIATE-Information.asn +INCLUDED_ASN_FILE_LIST = \ + CMIP.asn + # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ + $(INCLUDED_ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ $(PROTOCOL_NAME).cnf diff --git a/asn1/gnm/Makefile.common b/asn1/gnm/Makefile.common index 4501e7123c..348bbe209b 100644 --- a/asn1/gnm/Makefile.common +++ b/asn1/gnm/Makefile.common @@ -24,11 +24,15 @@ EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ GNM.asn +INCLUDED_ASN_FILE_LIST = \ + ASN1DefinedTypesModule.asn + # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ + $(INCLUDED_ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ $(PROTOCOL_NAME).cnf diff --git a/asn1/gprscdr/Makefile.common b/asn1/gprscdr/Makefile.common index 4ff53c2bf2..eb975b87cd 100644 --- a/asn1/gprscdr/Makefile.common +++ b/asn1/gprscdr/Makefile.common @@ -27,11 +27,22 @@ ASN_FILE_LIST = \ GPRSChargingDataTypesV641.asn \ GPRSChargingDataTypesV1171.asn +INCLUDED_ASN_FILE_LIST = \ + 3GPPGenericChargingDataTypes.asn \ + GPRSChargingDataTypes.asn \ + GPRSChargingDataTypesV8e0.asn \ + GPRSChargingDataTypesV9f0.asn \ + GenericChargingDataTypes.asn \ + GenericChargingDataTypesV641.asn \ + GenericChargingDataTypesV8e0.asn \ + GenericChargingDataTypesV9f0.asn + # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ + $(INCLUDED_ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ $(PROTOCOL_NAME).cnf diff --git a/asn1/gsm_map/Makefile.common b/asn1/gsm_map/Makefile.common index 83ff701b2d..4e5f516dc9 100644 --- a/asn1/gsm_map/Makefile.common +++ b/asn1/gsm_map/Makefile.common @@ -71,11 +71,16 @@ ASN_FILE_LIST = \ $(SS_ASN_FILES) \ $(PROPRIETARY_ASN_FILES) +INCLUDED_ASN_FILE_LIST = \ + SS-Errors.asn \ + SS-Protocol.asn + # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ + $(INCLUDED_ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ $(PROTOCOL_NAME).cnf diff --git a/asn1/h248/Makefile.common b/asn1/h248/Makefile.common index 28e18389ac..962177603d 100644 --- a/asn1/h248/Makefile.common +++ b/asn1/h248/Makefile.common @@ -25,11 +25,15 @@ ASN_FILE_LIST = \ h248v3.asn \ h248v1support.asn +INCLUDED_ASN_FILE_LIST = \ + MEGACO.asn + # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ + $(INCLUDED_ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ $(PROTOCOL_NAME).cnf diff --git a/asn1/inap/Makefile.common b/asn1/inap/Makefile.common index 52303c6940..f054a5ca8c 100644 --- a/asn1/inap/Makefile.common +++ b/asn1/inap/Makefile.common @@ -51,11 +51,15 @@ ASN_FILE_LIST= \ IN-errorcodes.asn \ IN-errortypes.asn +INCLUDED_ASN_FILE_LIST = \ + inap.asn + # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ + $(INCLUDED_ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ $(PROTOCOL_NAME).cnf diff --git a/asn1/isdn-sup/Makefile.common b/asn1/isdn-sup/Makefile.common index 262ce4f367..495ca984eb 100644 --- a/asn1/isdn-sup/Makefile.common +++ b/asn1/isdn-sup/Makefile.common @@ -36,11 +36,21 @@ ASN_FILE_LIST = \ User-To-User-Signalling-Operations.asn \ Freephone-Operations.asn +INCLUDED_ASN_FILE_LIST = \ + CCBS-Operations-and-Errors.asn \ + CCBS-private-networks-Operations-and-Errors.asn \ + Explicit-Call-Transfer-Operations-and-Errors.asn \ + MWI-Operations-and-Errors.asn \ + Outgoing-Call-Barring-Operations-and-Errors.asn \ + Set-Operations-and-Errors.asn \ + Three-Party-Operations.asn + # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ + $(INCLUDED_ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/kerberos/Makefile.common b/asn1/kerberos/Makefile.common index 84fe6032c7..1871c27ca4 100644 --- a/asn1/kerberos/Makefile.common +++ b/asn1/kerberos/Makefile.common @@ -30,6 +30,7 @@ ASN_FILE_LIST = \ RFC3244.asn EXTRA_DIST = \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/lpp/Makefile.common b/asn1/lpp/Makefile.common index c1e8c7f94e..e7dfea3481 100644 --- a/asn1/lpp/Makefile.common +++ b/asn1/lpp/Makefile.common @@ -31,6 +31,7 @@ EXTRA_DIST = \ $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ + packet-$(PROTOCOL_NAME)-template.h \ $(PROTOCOL_NAME).cnf SRC_FILES = \ diff --git a/asn1/ros/Makefile.common b/asn1/ros/Makefile.common index 53a5a9fcc6..8e1d5bfa5c 100644 --- a/asn1/ros/Makefile.common +++ b/asn1/ros/Makefile.common @@ -27,14 +27,7 @@ ASN_FILE_LIST = \ $(PROTOCOL_NAME).asn \ Remote-Operations-Information-Objects.asn -# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn -# files do not exist # for all protocols: Please add/remove as required. -EXTRA_DIST = \ - $(EXTRA_DIST_COMMON) \ - $(ASN_FILE_LIST) \ - packet-$(PROTOCOL_NAME)-template.c \ - packet-$(PROTOCOL_NAME)-template.h \ - $(PROTOCOL_NAME).cnf \ +INCLUDED_ASN_FILE_LIST = \ Remote-Operations-Generic-ROS-PDUs.asn \ Remote-Operations-Information-Objects.asn \ Remote-Operations-Useful-Definitions.asn \ @@ -43,6 +36,16 @@ EXTRA_DIST = \ ros-rej.cnf \ ros-res.cnf +# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn +# files do not exist # for all protocols: Please add/remove as required. +EXTRA_DIST = \ + $(EXTRA_DIST_COMMON) \ + $(ASN_FILE_LIST) \ + $(INCLUDED_ASN_FILE_LIST) \ + packet-$(PROTOCOL_NAME)-template.c \ + packet-$(PROTOCOL_NAME)-template.h \ + $(PROTOCOL_NAME).cnf + SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) diff --git a/asn1/t38/Makefile.common b/asn1/t38/Makefile.common index bac2fbccce..de556f6893 100644 --- a/asn1/t38/Makefile.common +++ b/asn1/t38/Makefile.common @@ -24,9 +24,13 @@ EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ T38_2002.asn +INCLUDED_ASN_FILE_LIST = \ + T38_1998.asn + EXTRA_DIST = \ $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ + $(INCLUDED_ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ $(PROTOCOL_NAME).cnf diff --git a/asn1/tcap/Makefile.common b/asn1/tcap/Makefile.common index 3f4872f834..a3bd434afc 100644 --- a/asn1/tcap/Makefile.common +++ b/asn1/tcap/Makefile.common @@ -26,16 +26,19 @@ ASN_FILE_LIST = \ UnidialoguePDUs.asn \ DialoguePDUs.asn +INCLUDED_ASN_FILE_LIST = \ + TCAPMessages.asn \ + TC-Notation-Extensions.asn + # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ + $(INCLUDED_ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ - $(PROTOCOL_NAME).cnf \ - TCAPMessages.asn \ - TC-Notation-Extensions.asn + $(PROTOCOL_NAME).cnf SRC_FILES = \ $(EXTRA_DIST) \ diff --git a/asn1/x721/Makefile.common b/asn1/x721/Makefile.common index 634b2c50ec..e4791bfbc3 100644 --- a/asn1/x721/Makefile.common +++ b/asn1/x721/Makefile.common @@ -19,7 +19,14 @@ #Dummy entry to pass the clean target PROTOCOL_NAME = dummy +ASN_FILE_LIST = + +INCLUDED_ASN_FILE_LIST = + EXTRA_DIST = \ + $(EXTRA_DIST_COMMON) \ + $(ASN_FILE_LIST) \ + $(INCLUDED_ASN_FILE_LIST) \ Attribute-ASN1Module.asn \ ManagedObjectClassesDefinitions.asn \ Notification-ASN1Module.asn \