[gtk+] build: make reftests work without installed tests
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] build: make reftests work without installed tests
- Date: Wed, 27 Aug 2014 00:05:56 +0000 (UTC)
commit 0f0fc59fbda5d037d50c599c018bca9befef6ad1
Author: Benjamin Otte <otte redhat com>
Date: Mon Aug 25 20:39:10 2014 +0200
build: make reftests work without installed tests
The libreftest.so module needs to be built in all cases.
Without installed tests, it needs to not be installed though.
https://bugzilla.gnome.org/show_bug.cgi?id=735401
testsuite/reftests/Makefile.am | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am
index f88876e..52a8d99 100644
--- a/testsuite/reftests/Makefile.am
+++ b/testsuite/reftests/Makefile.am
@@ -409,16 +409,6 @@ reftest_LTLIBRARIES = \
libreftest.la \
$(NULL)
-libreftest_la_LDFLAGS = -rpath $(reftestdir) -avoid-version -module $(no_undefined)
-libreftest_la_CFLAGS = $(gtk_reftest_CFLAGS)
-libreftest_la_LIBADD = $(gtk_reftest_LDADD)
-libreftest_la_SOURCES = \
- expand-expander.c \
- set-default-direction.c \
- statusbar-remove-all.c \
- textview-border-windows.c \
- $(NULL)
-
substitutions = \
-e s,@libexecdir\@,$(libexecdir),g \
$(NULL)
@@ -435,6 +425,20 @@ DISTCLEANFILES = $(built_tests)
testmetadir = $(datadir)/installed-tests/$(PACKAGE)
testmeta_DATA = $(built_tests)
+else
+noinst_LTLIBRARIES = \
+ libreftest.la \
+ $(NULL)
endif
+libreftest_la_LDFLAGS = -rpath $(reftestdir) -avoid-version -module $(no_undefined)
+libreftest_la_CFLAGS = $(gtk_reftest_CFLAGS)
+libreftest_la_LIBADD = $(gtk_reftest_LDADD)
+libreftest_la_SOURCES = \
+ expand-expander.c \
+ set-default-direction.c \
+ statusbar-remove-all.c \
+ textview-border-windows.c \
+ $(NULL)
+
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]