[glib] Fix make install with --disable-installed-tests
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Fix make install with --disable-installed-tests
- Date: Thu, 2 Jan 2014 18:36:55 +0000 (UTC)
commit 2b289cc5659276f570e9862ab8fd9d3733b88c22
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Jan 2 13:25:41 2014 -0500
Fix make install with --disable-installed-tests
If installed tests are not enabled, installed_testdir is not
defined, so we end up trying to create /modules and to chmod
things in /x-content/, which is not right.
gio/tests/Makefile.am | 2 ++
gio/tests/modules/Makefile.am | 21 ++++++++++++++++-----
2 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 1cb0924..c0722c9 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -542,5 +542,7 @@ giotypefuncs.c: Makefile
$(SED) -e 's/^/*tp++ = /' -e 's/$$/ ();/' >> xgen-gio && \
cp xgen-gio $@ # && rm -f xgen-gio xgen-giosrc.c
+if ENABLE_INSTALLED_TESTS
install-data-hook:
$(AM_V_at) chmod a+x $(DESTDIR)$(installed_testdir)/x-content/win32-software/autorun.exe
+endif
diff --git a/gio/tests/modules/Makefile.am b/gio/tests/modules/Makefile.am
index 95e4865..1e4e1fa 100644
--- a/gio/tests/modules/Makefile.am
+++ b/gio/tests/modules/Makefile.am
@@ -7,16 +7,27 @@ LDADD = \
$(top_builddir)/glib/libglib-2.0.la \
$(NULL)
-
AM_CPPFLAGS = \
$(gio_INCLUDES) $(GLIB_DEBUG_FLAGS) \
-I$(top_builddir)/gio \
- -I$(top_srcdir)/gio
+ -I$(top_srcdir)/gio \
+ $(NULL)
+
+modules = \
+ libtestmodulea.la \
+ libtestmoduleb.la \
+ $(NULL)
+
+if ENABLE_ALWAYS_BUILD_TESTS
+noinst_LTLIBRARIES = $(modules)
+else
+check_LTLIBRARIES = $(modules)
+endif
+if ENABLE_INSTALLED_TESTS
testmoduledir = $(installed_testdir)/modules
-testmodule_LTLIBRARIES = \
- libtestmodulea.la \
- libtestmoduleb.la
+testmodule_LTLIBRARIES = $(modules)
+endif
libtestmodulea_la_SOURCES = test-module-a.c
libtestmodulea_la_LIBADD = $(LDADD)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]