From 506e8f61ef1048bb436f6499925533aa5c0cf161 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 30 Jul 2014 16:41:51 -0700 Subject: 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 (cherry picked from commit 4d90d6e38d1afaeda387dea9522cc0417ff41141) Reviewed-on: https://code.wireshark.org/review/3315 Reviewed-by: Jeff Morriss --- asn1/t38/Makefile.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'asn1/t38') 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 \ -- cgit v1.2.3