Change in gapk[master]: build: fix packaging problems and make distcheck happy

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Vadim Yanitskiy gerrit-no-reply at lists.osmocom.org
Mon Jul 16 20:05:05 UTC 2018


Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/9930 )

Change subject: build: fix packaging problems and make distcheck happy
......................................................................

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
---
M libgsmhr/Makefile.am
M tests/Makefile.am
M tests/testsuite.at
3 files changed, 10 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Pau Espin Pedrol: Looks good to me, approved



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_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 @@
 	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 @@
 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
 

-- 
To view, visit https://gerrit.osmocom.org/9930
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: gapk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb8f6a2a81f9b75c8c6c5db443b0e7be02bc4153
Gerrit-Change-Number: 9930
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-CC: Harald Welte <laforge at gnumonks.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180716/d777c7da/attachment.htm>


More information about the gerrit-log mailing list