summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-06-29 14:47:56 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-08-07 10:10:18 +0100
commita20b991a8773647fd3b6dca454356a0be7b8e905 (patch)
tree3415ac45ee67dcfeda51e17c7b60f2b6ff8501c6
parent88280cbee61d61a9cd7d8d95b3dda719ea8aa4c5 (diff)
Install the examples and tests
-rw-r--r--examples/Makefile.am3
-rw-r--r--examples/video-profile/Makefile.am3
-rw-r--r--tests/Makefile.am15
3 files changed, 14 insertions, 7 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am
index e9e18d8..a1c3072 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,3 +1,4 @@
+exampleexecdir = $(libdir)/ytstenut/examples
SUBDIRS = video-profile
@@ -12,7 +13,7 @@ AM_LDFLAGS = ../ytstenut/libytstenut-@YTS_API_VERSION@.la
LDADD = $(YTS_LIBS)
-noinst_PROGRAMS = \
+exampleexec_PROGRAMS = \
dictionary-message \
echo \
file-transfer \
diff --git a/examples/video-profile/Makefile.am b/examples/video-profile/Makefile.am
index 8ed99e0..2360a19 100644
--- a/examples/video-profile/Makefile.am
+++ b/examples/video-profile/Makefile.am
@@ -1,3 +1,4 @@
+exampleexecdir = $(libdir)/ytstenut/examples
AM_CPPFLAGS = \
-I$(top_srcdir) \
@@ -10,7 +11,7 @@ AM_LDFLAGS = ../../ytstenut/libytstenut-@YTS_API_VERSION@.la
LDADD = $(YTS_LIBS)
-noinst_PROGRAMS = \
+exampleexec_PROGRAMS = \
player \
remote \
$(NULL)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index dad55d3..8b6f990 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +1,13 @@
+testexecdir = $(libdir)/ytstenut/tests
-TESTS = \
+tests = \
message \
$(NULL)
-if ENABLE_INTEGRATION_TESTS
-TESTS += \
+integration_tests = \
message-send \
status-set \
$(NULL)
-endif
AM_CPPFLAGS = \
-I$(top_srcdir) \
@@ -20,7 +19,13 @@ AM_CFLAGS = $(YTS_CFLAGS)
AM_LDFLAGS = ../ytstenut/libytstenut-@YTS_API_VERSION@.la
-check_PROGRAMS = $(TESTS)
+testexec_PROGRAMS = $(tests) $(integration_tests)
+
+TESTS = $(tests)
+
+if ENABLE_INTEGRATION_TESTS
+TESTS += $(integration_tests)
+endif
message_SOURCES = message.c
message_LDADD = $(YTS_LIBS)