From 62717b6375dfcc39cdb3f70f9ca7127074009c73 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Mon, 9 Jul 2018 22:01:39 +0700 Subject: build: fix packaging problems and make distcheck happy The 'distcheck' rule performs all of the operations associated with packaging a distribution and verifying that the distribution works. There were several problems: - libgsmhr/Makefile.am: 'patches' dir was not listed in EXTRA_DIST - libgsmhr/Makefile.am: (dist)clean targets wan't defined properly - tests/Makefile.am: 'ref-files' dir was not listed in EXTRA_DIST - tests/testsuite.at: wrong path was used for io_sample.txt Change-Id: Ieb8f6a2a81f9b75c8c6c5db443b0e7be02bc4153 --- libgsmhr/Makefile.am | 10 ++++++++-- tests/Makefile.am | 2 +- tests/testsuite.at | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libgsmhr/Makefile.am b/libgsmhr/Makefile.am index e6d246d..f36d759 100644 --- a/libgsmhr/Makefile.am +++ b/libgsmhr/Makefile.am @@ -1,7 +1,10 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS = -fPIC -Wall ${SYMBOL_VISIBILITY} -EXTRA_DIST=fetch_sources.py +EXTRA_DIST = \ + fetch_sources.py \ + patches \ + $(NULL) LIBVERSION=0:0:0 @@ -22,4 +25,7 @@ libgsmhr_la_SOURCES = $(REFSRC_SRC) libgsmhr.c libgsmhr_la_LIBADD = -ldl clean-local: - -rm -rf ${REFSRC_PATH}/*.{c,h} ${REFSRC_PATH}/.downloaded + -rm -rf ${REFSRC_PATH}/*.lo + +distclean-local: + -rm -rf ${REFSRC_PATH}/ diff --git a/tests/Makefile.am b/tests/Makefile.am index 4f7c4be..dee4060 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -79,7 +79,7 @@ EXTRA_DIST += \ io/pq_file_test.ok \ io/pq_rtp_test.ok \ io/io_sample.txt \ - ref-files/* \ + ref-files \ $(NULL) DISTCLEANFILES = atconfig atlocal diff --git a/tests/testsuite.at b/tests/testsuite.at index 5946661..1edd077 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -12,7 +12,7 @@ AT_KEYWORDS([pq_file]) cat $abs_srcdir/io/pq_file_test.ok > expout AT_CHECK([ $abs_top_builddir/tests/io/pq_file_test \ - $abs_top_builddir/tests/io/io_sample.txt], + $abs_srcdir/io/io_sample.txt], [0], [expout]) AT_CLEANUP -- cgit v1.2.3