From e61851f533abc09205d94076625bb68eae5af670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Thu, 12 Mar 2015 09:51:02 +0100
Subject: [PATCH] Fix missing files in the distributed archive and prevent
 intallation of private headers

---
 include/Makefile.am        | 4 ++--
 include/bcg729/Makefile.am | 6 ++++--
 test/Makefile.am           | 2 ++
 test/bin/Makefile.am       | 4 +++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/include/Makefile.am b/include/Makefile.am
index 8ace3bd..90a391b 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = bcg729
 
-include_HEADERS= adaptativeCodebookSearch.h \
+private_headers= adaptativeCodebookSearch.h \
 		basicOperationsMacros.h \
 		codebooks.h \
 		codecParameters.h \
@@ -28,4 +28,4 @@ include_HEADERS= adaptativeCodebookSearch.h \
 		typedef.h \
 		utils.h 
 
-EXTRA_DIST=$(include_HEADERS)
+EXTRA_DIST=$(private_headers)
diff --git a/include/bcg729/Makefile.am b/include/bcg729/Makefile.am
index 4ddad37..4013392 100644
--- a/include/bcg729/Makefile.am
+++ b/include/bcg729/Makefile.am
@@ -1,8 +1,10 @@
 bcg729_includedir=$(includedir)/bcg729
 
+public_headers=encoder.h decoder.h
+
 bcg729_include_HEADERS=
 if !BUILD_MSBCG729
-bcg729_include_HEADERS+=encoder.h decoder.h
+bcg729_include_HEADERS+=$(public_headers)
 endif
 
-EXTRA_DIST=$(bcg729_include_HEADERS)
+EXTRA_DIST=$(public_headers)
diff --git a/test/Makefile.am b/test/Makefile.am
index 6ae5df0..706b7f4 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,3 +1,5 @@
 SUBDIRS = bin
 
 TESTS = testCampaignAll
+
+EXTRA_DIST=testCampaignAll
diff --git a/test/bin/Makefile.am b/test/bin/Makefile.am
index e343173..a6fc98e 100644
--- a/test/bin/Makefile.am
+++ b/test/bin/Makefile.am
@@ -1,7 +1,9 @@
 check_PROGRAMS=adaptativeCodebookSearchTest computeAdaptativeCodebookGainTest computeLPTest computeWeightedSpeechTest decodeAdaptativeCodeVectorTest decodeFixedCodeVectorTest decodeGainsTest decodeLSPTest \
        decoderTest encoderTest decoderMultiChannelTest encoderMultiChannelTest findOpenLoopPitchDelayTest fixedCodebookSearchTest g729FixedPointMathTest gainQuantizationTest interpolateqLSPAndConvert2LPTest \
        LP2LSPConversionTest LPSynthesisFilterTest LSPQuantizationTest postFilterTest postProcessingTest preProcessingTest
-util_src=$(top_srcdir)/test/src/testUtils.c
+util_src= \
+	$(top_srcdir)/test/src/testUtils.c \
+	$(top_srcdir)/test/src/testUtils.h
 
 adaptativeCodebookSearchTest_SOURCES=$(top_srcdir)/test/src/adaptativeCodebookSearchTest.c $(util_src)
 computeAdaptativeCodebookGainTest_SOURCES=$(top_srcdir)/test/src/computeAdaptativeCodebookGainTest.c $(util_src)