From 4b86e62eb6bb9230985c53c121e6aa34642162cb Mon Sep 17 00:00:00 2001
From: David Reiss <dreiss@apache.org>
Date: Fri, 22 May 2009 19:52:06 +0000
Subject: [PATCH] THRIFT-373. Get some missing files into the release tarballs

- Added some stuff to EXTRA_DIST.
- Added some non-compiled sources to a C++ test.
- Made lib/perl/test a SUBDIR of lib/perl.

The last is a revert of r766558, but I moved the "Types.pm" rules in
lib/perl/test/Makefile.am to the check-local target, so it should still
work as expected (per THRIFT-461).

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@777681 13f79535-47bb-0310-9956-ffa450edef68
---
 Makefile.am               | 2 +-
 lib/java/Makefile.am      | 2 +-
 lib/perl/Makefile.am      | 3 +--
 lib/perl/test/Makefile.am | 2 +-
 lib/rb/Makefile.am        | 1 +
 test/Makefile.am          | 4 +++-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0c196ce1..bd566010 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,4 +25,4 @@ dist-hook:
 	find $(distdir) -name '.[a-zA-Z0-9]*' | xargs rm -rf
 
 EXTRA_DIST = bootstrap.sh cleanup.sh print_version.sh doc tutorial contrib \
-             CONTRIBUTORS LICENSE
+             CONTRIBUTORS LICENSE CHANGES DISCLAIMER NOTICE
diff --git a/lib/java/Makefile.am b/lib/java/Makefile.am
index c5c75217..cb1332e2 100644
--- a/lib/java/Makefile.am
+++ b/lib/java/Makefile.am
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-EXTRA_DIST = build.xml src test
+EXTRA_DIST = build.xml ivy.xml src test
 
 export CLASSPATH
 
diff --git a/lib/perl/Makefile.am b/lib/perl/Makefile.am
index fd1adf45..163d0158 100644
--- a/lib/perl/Makefile.am
+++ b/lib/perl/Makefile.am
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-SUBDIRS = 
+SUBDIRS = test
 
 Makefile-perl.mk : Makefile.PL
 	$(PERL) Makefile.PL MAKEFILE=Makefile-perl.mk INSTALLDIRS=$(INSTALLDIRS)
@@ -27,7 +27,6 @@ all-local: Makefile-perl.mk
 	find blib -name 'Makefile*' -exec rm -f {} \;
 
 check-local:
-	make -C test
 	$(PERL) -Iblib/lib -I@abs_srcdir@ -I@builddir@/test/gen-perl \
 		@abs_srcdir@/test.pl @abs_srcdir@/test/*.t
 
diff --git a/lib/perl/test/Makefile.am b/lib/perl/test/Makefile.am
index 0dcb15a4..ce87c48d 100644
--- a/lib/perl/test/Makefile.am
+++ b/lib/perl/test/Makefile.am
@@ -20,7 +20,7 @@
 THRIFT = @top_builddir@/compiler/cpp/thrift
 THRIFT_IF = @top_srcdir@/test/ThriftTest.thrift
 
-all-local: gen-perl/ThriftTest/Types.pm
+check-local: gen-perl/ThriftTest/Types.pm
 
 gen-perl/ThriftTest/Types.pm: $(THRIFT_IF)
 	$(THRIFT) --gen perl $(THRIFT_IF)
diff --git a/lib/rb/Makefile.am b/lib/rb/Makefile.am
index 3534e277..9cfffc71 100644
--- a/lib/rb/Makefile.am
+++ b/lib/rb/Makefile.am
@@ -25,6 +25,7 @@ EXTRA_DIST = \
 	lib \
 	ext \
 	benchmark \
+	script \
 	spec
 
 all-local:
diff --git a/test/Makefile.am b/test/Makefile.am
index c959f6ac..1226935d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -93,7 +93,9 @@ TPipedTransportTest_LDADD = \
 # AllProtocolsTest
 #
 AllProtocolsTest_SOURCES = \
-	AllProtocolTests.cpp
+	AllProtocolTests.cpp \
+	AllProtocolTests.tcc \
+	GenericHelpers.h
 
 AllProtocolsTest_LDADD = libtestgencpp.la
 
-- 
2.17.1