summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2014-01-31 23:49:33 -0800
committerKristian Høgsberg <krh@bitplanet.net>2014-01-31 23:49:33 -0800
commit396a9bb99567447b713ac4aca7342272b93dc831 (patch)
tree3637daa3f606e8ff220decb4ac97e751aa3ab686 /tests
parenta72d37566780ab8abab235cd21817733962cb1e1 (diff)
downloadweston-396a9bb99567447b713ac4aca7342272b93dc831.tar.gz
build: Use subdir-objects automake option
This makes automake place the object files in the same subdir as the source file. For a recursive build system as we have now, there's no difference, but with a non-recursive build system it means that the object files don't all end up in the toplevel directory.
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8b851460..1286514f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -52,7 +52,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/shared \
-I$(top_builddir)/src \
- -DUNIT_TEST \
$(COMPOSITOR_CFLAGS)
surface_global_test_la_SOURCES = surface-global-test.c
@@ -133,16 +132,17 @@ if ENABLE_XWAYLAND_TEST
xwayland_test = xwayland.weston
endif
+matrix_test_CPPFLAGS = -DUNIT_TEST
matrix_test_SOURCES = \
matrix-test.c \
- $(top_srcdir)/shared/matrix.c \
- $(top_srcdir)/shared/matrix.h
+ ../shared/matrix.c \
+ ../shared/matrix.h
matrix_test_LDADD = -lm -lrt
setbacklight_SOURCES = \
setbacklight.c \
- $(top_srcdir)/src/libbacklight.c \
- $(top_srcdir)/src/libbacklight.h
+ ../src/libbacklight.c \
+ ..//src/libbacklight.h
setbacklight_CFLAGS = $(AM_CFLAGS) $(SETBACKLIGHT_CFLAGS)
setbacklight_LDADD = $(SETBACKLIGHT_LIBS)