From 153f5856607b75ca76c540288cd6b4df144290ff Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Thu, 22 May 2014 17:19:15 +0200
Subject: misc: Fix distcheck and refer to the right file

---
 tests/Makefile.am         | 7 ++++---
 tests/osmux/osmux-test.ok | 1 -
 tests/osmux/osmux_test.ok | 1 +
 tests/testsuite.at        | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)
 delete mode 100644 tests/osmux/osmux-test.ok
 create mode 100644 tests/osmux/osmux_test.ok

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 96c6a1a..0c1fed3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,10 @@
-AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include
+AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS)
+AM_LDFLAGS = $(LIBOSMOCORE_LDFLAGS)
 
 check_PROGRAMS = osmux/osmux_test
 
 osmux_osmux_test_SOURCES = osmux/osmux_test.c
-osmux_osmux_test_LDADD = -losmocore $(top_builddir)/src/libosmonetif.la
+osmux_osmux_test_LDADD = $(LIBOSMOCORE_LIBS) $(top_builddir)/src/libosmonetif.la
 
 # The `:;' works around a Bash 3.2 bug when the output is not writeable.
 $(srcdir)/package.m4: $(top_srcdir)/configure.ac
@@ -24,7 +25,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
 	     } >'$(srcdir)/package.m4'
 
 EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE)		\
-	     osmux_test.ok
+	     osmux/osmux_test.ok
 
 DISTCLEANFILES = atconfig
 
diff --git a/tests/osmux/osmux-test.ok b/tests/osmux/osmux-test.ok
deleted file mode 100644
index 0f65527..0000000
--- a/tests/osmux/osmux-test.ok
+++ /dev/null
@@ -1 +0,0 @@
-OK: Test passed
diff --git a/tests/osmux/osmux_test.ok b/tests/osmux/osmux_test.ok
new file mode 100644
index 0000000..0f65527
--- /dev/null
+++ b/tests/osmux/osmux_test.ok
@@ -0,0 +1 @@
+OK: Test passed
diff --git a/tests/testsuite.at b/tests/testsuite.at
index b3bc50f..d0e55f6 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -3,6 +3,6 @@ AT_BANNER([Regression tests.])
 
 AT_SETUP([osmux_test])
 AT_KEYWORDS([osmux_test])
-cat $abs_srcdir/osmux/osmux-test.ok > expout
+cat $abs_srcdir/osmux/osmux_test.ok > expout
 AT_CHECK([$abs_top_builddir/tests/osmux/osmux_test], [0], [expout], [ignore])
 AT_CLEANUP
-- 
cgit v1.2.3