build: Fix make distcheck
Change-Id: I1fa5e34b44331cd56408ea7ad4483dcf6443b259
diff --git a/CommonLibs/Makefile.am b/CommonLibs/Makefile.am
index 613af1e..2332acb 100644
--- a/CommonLibs/Makefile.am
+++ b/CommonLibs/Makefile.am
@@ -25,10 +25,6 @@
AM_CXXFLAGS = -Wall -O3 -g -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
AM_CFLAGS = $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
-EXTRA_DIST = \
- example.config \
- README.common
-
noinst_LTLIBRARIES = libcommon.la
libcommon_la_SOURCES = \
diff --git a/Makefile.common b/Makefile.common
index 7bda7f6..1de9733 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -18,9 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-top_srcdir = $(abs_top_srcdir)
-top_builddir = $(abs_top_builddir)
-
COMMON_INCLUDEDIR = $(top_srcdir)/CommonLibs
GSM_INCLUDEDIR = $(top_srcdir)/GSM
diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index 3a872ef..d6dec2d 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -32,9 +32,7 @@
dist_rev2_DATA = std_inband.rbf
dist_rev4_DATA = std_inband.rbf
-EXTRA_DIST = \
- README \
- README.Talgorithm
+EXTRA_DIST = README
noinst_LTLIBRARIES = libtransceiver_common.la
diff --git a/Transceiver52M/arch/arm/Makefile.am b/Transceiver52M/arch/arm/Makefile.am
index 89ffb32..bc6da72 100644
--- a/Transceiver52M/arch/arm/Makefile.am
+++ b/Transceiver52M/arch/arm/Makefile.am
@@ -4,7 +4,7 @@
ARCH_FLAGS = -mfpu=neon
endif
-AM_CFLAGS = -Wall $(ARCH_FLAGS) -std=gnu99 -I../common
+AM_CFLAGS = -Wall $(ARCH_FLAGS) -std=gnu99 -I${srcdir}/../common
AM_CCASFLAGS = $(ARCH_FLAGS)
noinst_LTLIBRARIES = libarch.la
diff --git a/Transceiver52M/arch/x86/Makefile.am b/Transceiver52M/arch/x86/Makefile.am
index f39dde5..a79b80a 100644
--- a/Transceiver52M/arch/x86/Makefile.am
+++ b/Transceiver52M/arch/x86/Makefile.am
@@ -4,6 +4,11 @@
noinst_LTLIBRARIES += libarch_sse_3.la
noinst_LTLIBRARIES += libarch_sse_4_1.la
+noinst_HEADERS = \
+ convert_sse_3.h \
+ convert_sse_4_1.h \
+ convolve_sse_3.h
+
libarch_la_LIBADD = $(top_builddir)/Transceiver52M/arch/common/libarch_common.la
# SSE 3 specific code
diff --git a/tests/CommonLibs/Makefile.am b/tests/CommonLibs/Makefile.am
index 721c9a2..4543c72 100644
--- a/tests/CommonLibs/Makefile.am
+++ b/tests/CommonLibs/Makefile.am
@@ -9,7 +9,8 @@
SocketsTest.ok \
TimevalTest.ok \
VectorTest.ok \
- LogTest.ok
+ LogTest.ok \
+ LogTest.err
noinst_PROGRAMS = \
BitVectorTest \