[yelp] Convert tests subdirectory to non-recursive make
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [yelp] Convert tests subdirectory to non-recursive make
- Date: Mon, 26 Oct 2015 12:27:24 +0000 (UTC)
commit 437956c3d8e67db93d300111ec41bd121dccda24
Author: David King <amigadave amigadave com>
Date: Tue Oct 20 11:35:55 2015 +0200
Convert tests subdirectory to non-recursive make
Makefile.am | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
configure.ac | 1 -
tests/Makefile.am | 51 -------------------------------------------
3 files changed, 61 insertions(+), 53 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f758763..0b6b126 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,66 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS = libyelp libyelp/web-extension src po data tests docs
+SUBDIRS = libyelp libyelp/web-extension src po data docs
+
+YELP_COMMON_CFLAGS = \
+ $(YELP_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(YELP_DEFINES) \
+ -DDATADIR=\""$(datadir)"\" \
+ -I$(top_srcdir)/libyelp
+YELP_COMMON_LDADD = \
+ $(YELP_LIBS) \
+ $(WARN_LDFLAGS)
+
+check_PROGRAMS = \
+ tests/test-magic \
+ tests/test-settings \
+ tests/test-transform \
+ tests/test-uri \
+ tests/test-view
+
+if ENABLE_LZMA
+check_PROGRAMS += tests/test-lzma
+tests_test_lzma_libyelp_sources = $(top_srcdir)/libyelp/yelp-lzma-decompressor.c
+tests_test_lzma_CFLAGS = $(YELP_COMMON_CFLAGS)
+tests_test_lzma_LDADD = $(YELP_COMMON_LDADD)
+tests_test_lzma_SOURCES = tests/test-lzma.c $(tests_test_lzma_libyelp_sources)
+endif
+
+if ENABLE_BZ2
+check_PROGRAMS += tests/test-bz2
+tests_test_bz2_libyelp_sources = libyelp/yelp-bz2-decompressor.c
+tests_test_bz2_CFLAGS = $(YELP_COMMON_CFLAGS)
+tests_test_bz2_LDADD = $(YELP_COMMON_LDADD)
+tests_test_bz2_SOURCES = tests/test-bz2.c $(tests_test_bz2_libyelp_sources)
+endif
+
+tests_test_magic_CFLAGS = $(YELP_COMMON_CFLAGS)
+tests_test_magic_LDADD = $(YELP_COMMON_LDADD)
+tests_test_magic_SOURCES = tests/test-magic.c \
+ $(tests_test_bz2_libyelp_sources) \
+ $(tests_test_lzma_libyelp_sources) \
+ libyelp/yelp-magic-decompressor.c
+
+tests_test_settings_CFLAGS = $(YELP_COMMON_CFLAGS)
+tests_test_settings_LDADD = \
+ $(YELP_COMMON_LDADD) \
+ $(top_builddir)/libyelp/libyelp.la
+
+tests_test_transform_CFLAGS = $(YELP_COMMON_CFLAGS)
+tests_test_transform_LDADD = \
+ $(YELP_COMMON_LDADD) \
+ $(top_builddir)/libyelp/libyelp.la
+
+tests_test_uri_CFLAGS = $(YELP_COMMON_CFLAGS)
+tests_test_uri_LDADD = \
+ $(YELP_COMMON_LDADD) \
+ $(top_builddir)/libyelp/libyelp.la
+
+tests_test_view_CFLAGS = $(YELP_COMMON_CFLAGS)
+tests_test_view_LDADD = \
+ $(YELP_COMMON_LDADD) \
+ $(top_builddir)/libyelp/libyelp.la
@INTLTOOL_DESKTOP_RULE@
diff --git a/configure.ac b/configure.ac
index fee98a0..5955377 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,7 +220,6 @@ data/xslt/mal2html.xsl
data/xslt/man2html.xsl
data/xslt/yelp-common.xsl
po/Makefile.in
-tests/Makefile
libyelp/web-extension/Makefile
yelp.desktop.in
])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]