diff options
author | Guy Harris <guy@alum.mit.edu> | 2014-07-30 16:41:51 -0700 |
---|---|---|
committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2014-08-01 14:07:53 +0000 |
commit | 506e8f61ef1048bb436f6499925533aa5c0cf161 (patch) | |
tree | cd1c1afb11390ee048e390fc3aea1e916e4f05ce /asn1/t38 | |
parent | 0ef5fafcddee74562cceacc3f0c969fb1bb61d4f (diff) | |
download | wireshark-506e8f61ef1048bb436f6499925533aa5c0cf161.tar.gz wireshark-506e8f61ef1048bb436f6499925533aa5c0cf161.tar.bz2 wireshark-506e8f61ef1048bb436f6499925533aa5c0cf161.zip |
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.
Bug: 10331
Change-Id: Id91df577260fa57028d40fe098be1d79c59398e6
Reviewed-on: https://code.wireshark.org/review/3273
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 4d90d6e38d1afaeda387dea9522cc0417ff41141)
Reviewed-on: https://code.wireshark.org/review/3315
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Diffstat (limited to 'asn1/t38')
-rw-r--r-- | asn1/t38/Makefile.common | 2 |
1 files changed, 1 insertions, 1 deletions
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 \ |