diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-07-30 16:41:51 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-07-30 23:42:55 +0000 |
| commit | 4d90d6e38d1afaeda387dea9522cc0417ff41141 (patch) | |
| tree | 7cbdf1fad75fc71289076d77d4333923ed852113 | |
| parent | 3f0430d1f53c32e55649f5a6c9f9284af2190353 (diff) | |
| download | wireshark-4d90d6e38d1afaeda387dea9522cc0417ff41141.tar.gz | |
Add some files under asn1 to the distribution.
Include CMakeLists.txt files and the gnm subdirectory, along with the
top-level Makefile.inc and Makefile.preinc files. Don't explicitly
include Custom.make, as automake does that automatically given that it's
included by asn1/Makefile.am.
Add some files to EXTRA_DIST lists.
Move some .asn files to EXTRA_DIST; they don't need to be in SRC_FILES,
as SRC_FILES always includes EXTRA_DIST, and they *do* need to be in
EXTRA_DIST so that they're in the distribution.
Change-Id: Id91df577260fa57028d40fe098be1d79c59398e6
Reviewed-on: https://code.wireshark.org/review/3273
Reviewed-by: Guy Harris <guy@alum.mit.edu>
105 files changed, 129 insertions, 121 deletions
diff --git a/asn1/HI2Operations/Makefile.common b/asn1/HI2Operations/Makefile.common index eb4fa3d5a5..37b4737de6 100644 --- a/asn1/HI2Operations/Makefile.common +++ b/asn1/HI2Operations/Makefile.common @@ -29,7 +29,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/Makefile.am b/asn1/Makefile.am index d76fc581e7..e9a86936ac 100644 --- a/asn1/Makefile.am +++ b/asn1/Makefile.am @@ -36,18 +36,19 @@ SUBDIRS = \ charging_ase \ cmip \ cmp \ + cms \ credssp \ crmf \ - cms \ dap \ - dop \ disp \ + dop \ dsp \ ess \ ftam \ + gnm \ goose \ - gsm_map \ gprscdr \ + gsm_map \ h225 \ h235 \ h245 \ @@ -89,9 +90,9 @@ SUBDIRS = \ pkcs1 \ pkcs12 \ pkinit \ - pkixac \ pkix1explicit \ pkix1implicit \ + pkixac \ pkixproxy \ pkixqualified \ pkixtsp \ @@ -133,10 +134,12 @@ DONT_BUILD_SUBDIRS = \ DIST_SUBDIRS = $(SUBDIRS) $(DONT_BUILD_SUBDIRS) EXTRA_DIST = \ + CMakeLists.txt \ + Makefile.inc \ Makefile.nmake \ Makefile.inc.nmake \ - Makefile.preinc.nmake \ - Custom.make + Makefile.preinc \ + Makefile.preinc.nmake MAINTAINERCLEANFILES = \ Makefile.in diff --git a/asn1/Makefile.preinc b/asn1/Makefile.preinc index 3eade08770..de372ba9aa 100644 --- a/asn1/Makefile.preinc +++ b/asn1/Makefile.preinc @@ -20,3 +20,6 @@ MAKE_CNF_EXPORT = $(MAKE) generate_export +EXTRA_DIST_COMMON = \ + CMakeLists.txt \ + Makefile.nmake diff --git a/asn1/acp133/Makefile.common b/asn1/acp133/Makefile.common index 9d020d7ec5..b715a65cfe 100644 --- a/asn1/acp133/Makefile.common +++ b/asn1/acp133/Makefile.common @@ -28,7 +28,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/acse/Makefile.common b/asn1/acse/Makefile.common index e0a08e2be5..33ae7a7ea9 100644 --- a/asn1/acse/Makefile.common +++ b/asn1/acse/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/ansi_map/Makefile.common b/asn1/ansi_map/Makefile.common index 1999156a86..1342535641 100644 --- a/asn1/ansi_map/Makefile.common +++ b/asn1/ansi_map/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/ansi_tcap/Makefile.common b/asn1/ansi_tcap/Makefile.common index ba40d83477..9b251cdbb0 100644 --- a/asn1/ansi_tcap/Makefile.common +++ b/asn1/ansi_tcap/Makefile.common @@ -28,7 +28,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/atn-cm/Makefile.common b/asn1/atn-cm/Makefile.common index 1e567ea720..508ed3136c 100644 --- a/asn1/atn-cm/Makefile.common +++ b/asn1/atn-cm/Makefile.common @@ -24,7 +24,7 @@ EXT_ASN_FILE_LIST = ASN_FILE_LIST = $(PROTOCOL_NAME).asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/atn-cpdlc/Makefile.common b/asn1/atn-cpdlc/Makefile.common index d1a8c6ea7c..a372667c5a 100644 --- a/asn1/atn-cpdlc/Makefile.common +++ b/asn1/atn-cpdlc/Makefile.common @@ -24,7 +24,7 @@ EXT_ASN_FILE_LIST = ASN_FILE_LIST = $(PROTOCOL_NAME).asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/atn-ulcs/Makefile.common b/asn1/atn-ulcs/Makefile.common index ae6b99b682..fce3322668 100644 --- a/asn1/atn-ulcs/Makefile.common +++ b/asn1/atn-ulcs/Makefile.common @@ -24,7 +24,7 @@ EXT_ASN_FILE_LIST = ASN_FILE_LIST = $(PROTOCOL_NAME).asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/c1222/Makefile.common b/asn1/c1222/Makefile.common index 4aaa5769f0..81ff719440 100644 --- a/asn1/c1222/Makefile.common +++ b/asn1/c1222/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/camel/Makefile.common b/asn1/camel/Makefile.common index 2bf258924f..ca8a717f90 100644 --- a/asn1/camel/Makefile.common +++ b/asn1/camel/Makefile.common @@ -41,16 +41,17 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ $(PROTOCOL_NAME).asn \ - $(PROTOCOL_NAME).cnf + $(PROTOCOL_NAME).cnf \ + TCAPMessages.asn SRC_FILES = \ - $(EXT_ASN_FILE_LIST) \ - $(EXTRA_DIST) + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) A2W_FLAGS= -b -L diff --git a/asn1/cdt/Makefile.common b/asn1/cdt/Makefile.common index f1dbfa6a78..5bf313e49b 100644 --- a/asn1/cdt/Makefile.common +++ b/asn1/cdt/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/charging_ase/Makefile.common b/asn1/charging_ase/Makefile.common index 38a1458a1e..912ede4faa 100644 --- a/asn1/charging_ase/Makefile.common +++ b/asn1/charging_ase/Makefile.common @@ -25,15 +25,15 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ $(PROTOCOL_NAME).cnf SRC_FILES = \ - $(EXT_ASN_FILE_LIST) \ - $(EXTRA_DIST) + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) A2W_FLAGS= -b diff --git a/asn1/cmip/Makefile.common b/asn1/cmip/Makefile.common index 61f14db762..45d7a34ed2 100644 --- a/asn1/cmip/Makefile.common +++ b/asn1/cmip/Makefile.common @@ -35,7 +35,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/cmp/Makefile.common b/asn1/cmp/Makefile.common index e0e40cfcf1..89ce31958e 100644 --- a/asn1/cmp/Makefile.common +++ b/asn1/cmp/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/cms/Makefile.common b/asn1/cms/Makefile.common index 9f0a0dc894..41541fd057 100644 --- a/asn1/cms/Makefile.common +++ b/asn1/cms/Makefile.common @@ -31,7 +31,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/credssp/Makefile.common b/asn1/credssp/Makefile.common index 04d8a41a75..91e1682c9a 100644 --- a/asn1/credssp/Makefile.common +++ b/asn1/credssp/Makefile.common @@ -29,7 +29,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/crmf/Makefile.common b/asn1/crmf/Makefile.common index fc1378acc2..48c69da6bd 100644 --- a/asn1/crmf/Makefile.common +++ b/asn1/crmf/Makefile.common @@ -29,7 +29,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/dap/Makefile.common b/asn1/dap/Makefile.common index 8ed9e6b262..3451f88a1d 100644 --- a/asn1/dap/Makefile.common +++ b/asn1/dap/Makefile.common @@ -31,7 +31,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/disp/Makefile.common b/asn1/disp/Makefile.common index feeffa60d8..113d696005 100644 --- a/asn1/disp/Makefile.common +++ b/asn1/disp/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/dop/Makefile.common b/asn1/dop/Makefile.common index 21b3e6a41b..13a68e96c3 100644 --- a/asn1/dop/Makefile.common +++ b/asn1/dop/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/dsp/Makefile.common b/asn1/dsp/Makefile.common index 6f091fcc2a..f1acd788cf 100644 --- a/asn1/dsp/Makefile.common +++ b/asn1/dsp/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/ess/Makefile.common b/asn1/ess/Makefile.common index 7d4ef31f7e..b843734a98 100644 --- a/asn1/ess/Makefile.common +++ b/asn1/ess/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/ftam/Makefile.common b/asn1/ftam/Makefile.common index 3618b729eb..8248f0fff3 100644 --- a/asn1/ftam/Makefile.common +++ b/asn1/ftam/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/gnm/Makefile.common b/asn1/gnm/Makefile.common index 956ddb8e80..4501e7123c 100644 --- a/asn1/gnm/Makefile.common +++ b/asn1/gnm/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/goose/Makefile.common b/asn1/goose/Makefile.common index d44f25dbb5..b9946fa1ae 100644 --- a/asn1/goose/Makefile.common +++ b/asn1/goose/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/gprscdr/Makefile.common b/asn1/gprscdr/Makefile.common index 003ca15114..4ff53c2bf2 100644 --- a/asn1/gprscdr/Makefile.common +++ b/asn1/gprscdr/Makefile.common @@ -30,15 +30,15 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ $(PROTOCOL_NAME).cnf SRC_FILES = \ - $(EXT_ASN_FILE_LIST) \ - $(EXTRA_DIST) + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) A2W_FLAGS= -b diff --git a/asn1/gsm_map/Makefile.common b/asn1/gsm_map/Makefile.common index 770eb4daac..83ff701b2d 100644 --- a/asn1/gsm_map/Makefile.common +++ b/asn1/gsm_map/Makefile.common @@ -74,7 +74,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/h225/Makefile.common b/asn1/h225/Makefile.common index 0e4a62f5d9..c80f70cc0b 100644 --- a/asn1/h225/Makefile.common +++ b/asn1/h225/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/h235/Makefile.common b/asn1/h235/Makefile.common index 37f5e3f0ad..d3a1bb6908 100644 --- a/asn1/h235/Makefile.common +++ b/asn1/h235/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/h245/Makefile.common b/asn1/h245/Makefile.common index e891df72aa..5f8202bd9e 100644 --- a/asn1/h245/Makefile.common +++ b/asn1/h245/Makefile.common @@ -28,7 +28,7 @@ ASN_FILE_LIST = \ MULTIMEDIA-SYSTEM-CONTROL.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/h248/Makefile.common b/asn1/h248/Makefile.common index 5faab385c3..28e18389ac 100644 --- a/asn1/h248/Makefile.common +++ b/asn1/h248/Makefile.common @@ -28,7 +28,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/h282/Makefile.common b/asn1/h282/Makefile.common index a6909547dc..07bf786b07 100644 --- a/asn1/h282/Makefile.common +++ b/asn1/h282/Makefile.common @@ -25,7 +25,7 @@ ASN_FILE_LIST = \ RDC-PROTOCOL.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/h283/Makefile.common b/asn1/h283/Makefile.common index 4158d45260..dce8a40778 100644 --- a/asn1/h283/Makefile.common +++ b/asn1/h283/Makefile.common @@ -25,7 +25,7 @@ ASN_FILE_LIST = \ LCT-PROTOCOL.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/h323/Makefile.common b/asn1/h323/Makefile.common index 3ee3db3b0b..0c15035254 100644 --- a/asn1/h323/Makefile.common +++ b/asn1/h323/Makefile.common @@ -26,7 +26,7 @@ ASN_FILE_LIST = \ ROBUSTNESS-DATA.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/h450-ros/Makefile.common b/asn1/h450-ros/Makefile.common index da75b40fd0..da38f5dab5 100644 --- a/asn1/h450-ros/Makefile.common +++ b/asn1/h450-ros/Makefile.common @@ -32,7 +32,7 @@ ASN_FILE_LIST = Remote-Operations-Apdus.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 = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/h450/Makefile.common b/asn1/h450/Makefile.common index bce54974e9..6b2b0382ca 100644 --- a/asn1/h450/Makefile.common +++ b/asn1/h450/Makefile.common @@ -51,7 +51,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/h460/Makefile.common b/asn1/h460/Makefile.common index 2a8e79ca9e..357b37a4a7 100644 --- a/asn1/h460/Makefile.common +++ b/asn1/h460/Makefile.common @@ -36,7 +36,7 @@ ASN_FILE_LIST = \ MESSAGE-BROADCAST.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/h501/Makefile.common b/asn1/h501/Makefile.common index dc3c491434..2bb469357a 100644 --- a/asn1/h501/Makefile.common +++ b/asn1/h501/Makefile.common @@ -25,7 +25,7 @@ ASN_FILE_LIST = \ H501-MESSAGES.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/hnbap/Makefile.common b/asn1/hnbap/Makefile.common index df7b04d416..c9ddd35276 100644 --- a/asn1/hnbap/Makefile.common +++ b/asn1/hnbap/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ HNBAP-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/idmp/Makefile.common b/asn1/idmp/Makefile.common index 91291297b7..0e9cb3c83e 100644 --- a/asn1/idmp/Makefile.common +++ b/asn1/idmp/Makefile.common @@ -31,7 +31,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/ilp/Makefile.common b/asn1/ilp/Makefile.common index c94a240081..0d165c50fa 100644 --- a/asn1/ilp/Makefile.common +++ b/asn1/ilp/Makefile.common @@ -26,7 +26,7 @@ ASN_FILE_LIST = \ ILP-Components.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/inap/Makefile.common b/asn1/inap/Makefile.common index a701664c83..52303c6940 100644 --- a/asn1/inap/Makefile.common +++ b/asn1/inap/Makefile.common @@ -54,7 +54,7 @@ ASN_FILE_LIST= \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/isdn-sup/Makefile.common b/asn1/isdn-sup/Makefile.common index 49dddefc29..262ce4f367 100644 --- a/asn1/isdn-sup/Makefile.common +++ b/asn1/isdn-sup/Makefile.common @@ -39,7 +39,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/lcsap/Makefile.common b/asn1/lcsap/Makefile.common index 21dee667a7..cbe0507317 100644 --- a/asn1/lcsap/Makefile.common +++ b/asn1/lcsap/Makefile.common @@ -36,7 +36,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/ldap/Makefile.common b/asn1/ldap/Makefile.common index 5b98e43d51..fbfb84f248 100644 --- a/asn1/ldap/Makefile.common +++ b/asn1/ldap/Makefile.common @@ -29,7 +29,7 @@ ASN_FILE_LIST = Lightweight-Directory-Access-Protocol-V3.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 = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/logotypecertextn/Makefile.common b/asn1/logotypecertextn/Makefile.common index d0e7955e00..726cbde191 100644 --- a/asn1/logotypecertextn/Makefile.common +++ b/asn1/logotypecertextn/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist # for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(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 2e4195280e..c1e8c7f94e 100644 --- a/asn1/lpp/Makefile.common +++ b/asn1/lpp/Makefile.common @@ -28,7 +28,7 @@ ASN_FILE_LIST = \ LPP.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/lppa/Makefile.common b/asn1/lppa/Makefile.common index ed6d66e637..63f8a729ef 100644 --- a/asn1/lppa/Makefile.common +++ b/asn1/lppa/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ LPPA-PDU.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/lppe/Makefile.common b/asn1/lppe/Makefile.common index c243427cd3..07deca4c61 100644 --- a/asn1/lppe/Makefile.common +++ b/asn1/lppe/Makefile.common @@ -25,7 +25,7 @@ ASN_FILE_LIST = \ LPPe.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/lte-rrc/Makefile.common b/asn1/lte-rrc/Makefile.common index e4ddc4ef90..3c906bc578 100644 --- a/asn1/lte-rrc/Makefile.common +++ b/asn1/lte-rrc/Makefile.common @@ -29,7 +29,7 @@ ASN_FILE_LIST = \ EUTRA-InterNodeDefinitions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/m3ap/Makefile.common b/asn1/m3ap/Makefile.common index f2c137776f..b7a5b55674 100644 --- a/asn1/m3ap/Makefile.common +++ b/asn1/m3ap/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ M3AP-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/mms/Makefile.common b/asn1/mms/Makefile.common index e71b30eb9b..02fc04b7f3 100644 --- a/asn1/mms/Makefile.common +++ b/asn1/mms/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/mpeg-audio/Makefile.common b/asn1/mpeg-audio/Makefile.common index fda7ba6cd4..914c23d137 100644 --- a/asn1/mpeg-audio/Makefile.common +++ b/asn1/mpeg-audio/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/mpeg-pes/Makefile.common b/asn1/mpeg-pes/Makefile.common index 38c2ccc57b..22e2a2231a 100644 --- a/asn1/mpeg-pes/Makefile.common +++ b/asn1/mpeg-pes/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/nbap/Makefile.common b/asn1/nbap/Makefile.common index 29524383d7..4a658baa9c 100644 --- a/asn1/nbap/Makefile.common +++ b/asn1/nbap/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ NBAP-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/novell_pkis/Makefile.common b/asn1/novell_pkis/Makefile.common index d0a00d0e4e..86ce4076fe 100644 --- a/asn1/novell_pkis/Makefile.common +++ b/asn1/novell_pkis/Makefile.common @@ -22,14 +22,13 @@ EXT_ASN_FILE_LIST = ASN_FILE_LIST = $(PROTOCOL_NAME).asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf SRC_FILES = \ $(EXTRA_DIST) \ - $(EXT_ASN_FILE_LIST) \ - $(ASN_FILE_LIST) + $(EXT_ASN_FILE_LIST) A2W_FLAGS = -b -u diff --git a/asn1/ns_cert_exts/Makefile.common b/asn1/ns_cert_exts/Makefile.common index 3b62d182d0..1cd669501a 100644 --- a/asn1/ns_cert_exts/Makefile.common +++ b/asn1/ns_cert_exts/Makefile.common @@ -25,7 +25,7 @@ ASN_FILE_LIST = \ NETSCAPE-CERT-EXTS.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/ocsp/Makefile.common b/asn1/ocsp/Makefile.common index a53276b0a9..d1d3eaed64 100644 --- a/asn1/ocsp/Makefile.common +++ b/asn1/ocsp/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/p1/Makefile.common b/asn1/p1/Makefile.common index 5bc0d4d4f1..6923b4f53f 100644 --- a/asn1/p1/Makefile.common +++ b/asn1/p1/Makefile.common @@ -33,7 +33,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/p22/Makefile.common b/asn1/p22/Makefile.common index 10c7ff23ad..65631f1250 100644 --- a/asn1/p22/Makefile.common +++ b/asn1/p22/Makefile.common @@ -38,7 +38,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/p7/Makefile.common b/asn1/p7/Makefile.common index 6caef7a6d0..fd3cbd195b 100644 --- a/asn1/p7/Makefile.common +++ b/asn1/p7/Makefile.common @@ -33,7 +33,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/p772/Makefile.common b/asn1/p772/Makefile.common index af2aa9a094..ae49d59c2e 100644 --- a/asn1/p772/Makefile.common +++ b/asn1/p772/Makefile.common @@ -35,7 +35,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/pcap/Makefile.common b/asn1/pcap/Makefile.common index 21b0413735..5265ac3ede 100644 --- a/asn1/pcap/Makefile.common +++ b/asn1/pcap/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ PCAP-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/pkcs1/Makefile.common b/asn1/pkcs1/Makefile.common index c99ba3212d..d03a3bc563 100644 --- a/asn1/pkcs1/Makefile.common +++ b/asn1/pkcs1/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/pkcs12/Makefile.common b/asn1/pkcs12/Makefile.common index 0be5b5a57f..04226bb180 100644 --- a/asn1/pkcs12/Makefile.common +++ b/asn1/pkcs12/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/pkinit/Makefile.common b/asn1/pkinit/Makefile.common index 74617c3a7b..aefd7def24 100644 --- a/asn1/pkinit/Makefile.common +++ b/asn1/pkinit/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/pkix1explicit/Makefile.common b/asn1/pkix1explicit/Makefile.common index 37ff1c8711..c0f52265e6 100644 --- a/asn1/pkix1explicit/Makefile.common +++ b/asn1/pkix1explicit/Makefile.common @@ -28,10 +28,11 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ + pkix1explicit_exp.cnf \ $(PROTOCOL_NAME).cnf SRC_FILES = \ diff --git a/asn1/pkix1implicit/Makefile.common b/asn1/pkix1implicit/Makefile.common index ad31cccd37..d11a40c770 100644 --- a/asn1/pkix1implicit/Makefile.common +++ b/asn1/pkix1implicit/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/pkixac/Makefile.common b/asn1/pkixac/Makefile.common index 10f18b3d68..422894cc1b 100644 --- a/asn1/pkixac/Makefile.common +++ b/asn1/pkixac/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/pkixproxy/Makefile.common b/asn1/pkixproxy/Makefile.common index 063ffab004..9b8e8c933f 100644 --- a/asn1/pkixproxy/Makefile.common +++ b/asn1/pkixproxy/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/pkixqualified/Makefile.common b/asn1/pkixqualified/Makefile.common index b6d228ae91..b99c4047d7 100644 --- a/asn1/pkixqualified/Makefile.common +++ b/asn1/pkixqualified/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/pkixtsp/Makefile.common b/asn1/pkixtsp/Makefile.common index 5a91370054..5d9b2e841e 100644 --- a/asn1/pkixtsp/Makefile.common +++ b/asn1/pkixtsp/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/pres/Makefile.common b/asn1/pres/Makefile.common index 5fa0136115..760da09b51 100644 --- a/asn1/pres/Makefile.common +++ b/asn1/pres/Makefile.common @@ -28,7 +28,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/q932-ros/Makefile.common b/asn1/q932-ros/Makefile.common index 3f63c43bd4..32dcd69451 100644 --- a/asn1/q932-ros/Makefile.common +++ b/asn1/q932-ros/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/q932/Makefile.common b/asn1/q932/Makefile.common index 2f182f4a78..7e49b4c087 100644 --- a/asn1/q932/Makefile.common +++ b/asn1/q932/Makefile.common @@ -32,7 +32,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/qsig/Makefile.common b/asn1/qsig/Makefile.common index 87ec63b10f..e800a15adb 100644 --- a/asn1/qsig/Makefile.common +++ b/asn1/qsig/Makefile.common @@ -56,7 +56,7 @@ ASN_FILE_LIST = \ QSIG-MID.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/ranap/Makefile.common b/asn1/ranap/Makefile.common index 7fc57eebf5..915d547aa7 100644 --- a/asn1/ranap/Makefile.common +++ b/asn1/ranap/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ RANAP-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/rnsap/Makefile.common b/asn1/rnsap/Makefile.common index dee66bdd53..a71a45ef91 100644 --- a/asn1/rnsap/Makefile.common +++ b/asn1/rnsap/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ RNSAP-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/ros/Makefile.common b/asn1/ros/Makefile.common index b2adee2ffb..53a5a9fcc6 100644 --- a/asn1/ros/Makefile.common +++ b/asn1/ros/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist # for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/rrc/Makefile.common b/asn1/rrc/Makefile.common index f4c4b2a786..7058480156 100644 --- a/asn1/rrc/Makefile.common +++ b/asn1/rrc/Makefile.common @@ -29,7 +29,7 @@ ASN_FILE_LIST = \ Internode-definitions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/rrlp/Makefile.common b/asn1/rrlp/Makefile.common index bf3a2beef2..a54282c285 100644 --- a/asn1/rrlp/Makefile.common +++ b/asn1/rrlp/Makefile.common @@ -28,7 +28,7 @@ ASN_FILE_LIST = \ RRLP-Components.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/rtse/Makefile.common b/asn1/rtse/Makefile.common index ceca8e1863..592fe01826 100644 --- a/asn1/rtse/Makefile.common +++ b/asn1/rtse/Makefile.common @@ -29,7 +29,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/rua/Makefile.common b/asn1/rua/Makefile.common index 70adb5a9a2..093e48ee76 100644 --- a/asn1/rua/Makefile.common +++ b/asn1/rua/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ RUA-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/s1ap/Makefile.common b/asn1/s1ap/Makefile.common index 885835e340..b9c9edc600 100644 --- a/asn1/s1ap/Makefile.common +++ b/asn1/s1ap/Makefile.common @@ -33,7 +33,7 @@ ASN_FILE_LIST = \ S1AP-SonTransfer-IEs.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/sabp/Makefile.common b/asn1/sabp/Makefile.common index c29d0667a0..4f499cee1b 100644 --- a/asn1/sabp/Makefile.common +++ b/asn1/sabp/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ SABP-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/sbc-ap/Makefile.common b/asn1/sbc-ap/Makefile.common index 84c828ec6e..4bc5eb25a7 100644 --- a/asn1/sbc-ap/Makefile.common +++ b/asn1/sbc-ap/Makefile.common @@ -32,7 +32,7 @@ ASN_FILE_LIST = \ SBC-AP-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/smrse/Makefile.common b/asn1/smrse/Makefile.common index 7650fad19e..806865a00e 100644 --- a/asn1/smrse/Makefile.common +++ b/asn1/smrse/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/snmp/Makefile.common b/asn1/snmp/Makefile.common index cd7585dde4..e9fc6ae01d 100644 --- a/asn1/snmp/Makefile.common +++ b/asn1/snmp/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/spnego/Makefile.common b/asn1/spnego/Makefile.common index 00bc68cc15..074396f70a 100644 --- a/asn1/spnego/Makefile.common +++ b/asn1/spnego/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/sv/Makefile.common b/asn1/sv/Makefile.common index 3c6fcf3c89..828affa5de 100644 --- a/asn1/sv/Makefile.common +++ b/asn1/sv/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/t124/Makefile.common b/asn1/t124/Makefile.common index 2188abd6e7..1875807570 100644 --- a/asn1/t124/Makefile.common +++ b/asn1/t124/Makefile.common @@ -28,7 +28,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/t125/Makefile.common b/asn1/t125/Makefile.common index ef371ae972..e03aba42e2 100644 --- a/asn1/t125/Makefile.common +++ b/asn1/t125/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/t38/Makefile.common b/asn1/t38/Makefile.common index 164dc2a5a7..bac2fbccce 100644 --- a/asn1/t38/Makefile.common +++ b/asn1/t38/Makefile.common @@ -25,7 +25,7 @@ ASN_FILE_LIST = \ T38_2002.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/tcap/Makefile.common b/asn1/tcap/Makefile.common index 2db3524cad..3f4872f834 100644 --- a/asn1/tcap/Makefile.common +++ b/asn1/tcap/Makefile.common @@ -29,17 +29,17 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ - $(PROTOCOL_NAME).cnf + $(PROTOCOL_NAME).cnf \ + TCAPMessages.asn \ + TC-Notation-Extensions.asn SRC_FILES = \ $(EXTRA_DIST) \ - $(EXT_ASN_FILE_LIST) \ - TCAPMessages.asn \ - TC-Notation-Extensions.asn + $(EXT_ASN_FILE_LIST) A2W_FLAGS= -b diff --git a/asn1/tetra/Makefile.common b/asn1/tetra/Makefile.common index 5482280a26..d6988551be 100644 --- a/asn1/tetra/Makefile.common +++ b/asn1/tetra/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/ulp/Makefile.common b/asn1/ulp/Makefile.common index f73588c4ee..dcd9f37e24 100644 --- a/asn1/ulp/Makefile.common +++ b/asn1/ulp/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ ULP-Components.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/wlancertextn/Makefile.common b/asn1/wlancertextn/Makefile.common index 4d0b9cb7cf..2940a92e49 100644 --- a/asn1/wlancertextn/Makefile.common +++ b/asn1/wlancertextn/Makefile.common @@ -27,7 +27,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/x2ap/Makefile.common b/asn1/x2ap/Makefile.common index 16ce9870a9..acb56be71a 100644 --- a/asn1/x2ap/Makefile.common +++ b/asn1/x2ap/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ X2AP-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff --git a/asn1/x509af/Makefile.common b/asn1/x509af/Makefile.common index 19004cd124..bc25d15a99 100644 --- a/asn1/x509af/Makefile.common +++ b/asn1/x509af/Makefile.common @@ -29,7 +29,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/x509ce/Makefile.common b/asn1/x509ce/Makefile.common index 510838fc42..df7c3581b5 100644 --- a/asn1/x509ce/Makefile.common +++ b/asn1/x509ce/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/x509if/Makefile.common b/asn1/x509if/Makefile.common index 8aab644c58..9aae6316c1 100644 --- a/asn1/x509if/Makefile.common +++ b/asn1/x509if/Makefile.common @@ -31,7 +31,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/asn1/x509sat/Makefile.common b/asn1/x509sat/Makefile.common index 168949bf6e..68a41ff86f 100644 --- a/asn1/x509sat/Makefile.common +++ b/asn1/x509sat/Makefile.common @@ -30,7 +30,7 @@ ASN_FILE_LIST = \ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff --git a/configure.ac b/configure.ac index 5c663f63e7..6c1295cf41 100644 --- a/configure.ac +++ b/configure.ac @@ -2791,6 +2791,7 @@ AC_OUTPUT( asn1/dsp/Makefile asn1/ess/Makefile asn1/ftam/Makefile + asn1/gnm/Makefile asn1/goose/Makefile asn1/gprscdr/Makefile asn1/gsm_map/Makefile |