Makefile.am: Look in $builddir for headers when building vala tests

[platform/upstream/libsecret.git] / libsecret / Makefile.am

diff --git a/libsecret/Makefile.am b/libsecret/Makefile.am
index 1b136b0..3b48a30 100644 (file)
--- a/libsecret/Makefile.am
+++ b/libsecret/Makefile.am
@@ -74,9 +74,12 @@ BUILT_SOURCES += $(libsecret_BUILT)
 
 noinst_LTLIBRARIES += libsecret-testable.la
 libsecret_testable_la_SOURCES =
-libsecret_testable_la_LIBADD = $(libsecret_@SECRET_MAJOR@_la_OBJECTS) \
+libsecret_testable_la_LIBADD = \
+       $(libsecret_@SECRET_MAJOR@_la_OBJECTS) \
        $(libsecret_@SECRET_MAJOR@_la_LIBADD)
-EXTRA_libsecret_testable_la_DEPENDENCIES = $(libsecret_@SECRET_MAJOR@_la_OBJECTS)
+libsecret_testable_la_DEPENDENCIES = \
+       $(libsecret_@SECRET_MAJOR@_la_OBJECTS) \
+       $(libsecret_@SECRET_MAJOR@_la_DEPENDENCIES)
 libsecret_testable_la_LDFLAGS = -rpath /force/shared
 
 DBUS_XML_DEFINITIONS = \
@@ -258,6 +261,7 @@ VALA_V_0 = @echo "  VALAC   " $@;
 VALA_TESTS_FLAGS = \
        --Xcc=-w \
        --Xcc=-I$(srcdir) \
+       --Xcc=-I$(builddir) \
        --Xcc=-I$(srcdir)/libsecret \
        --vapidir=$(builddir) \
        --pkg libsecret-@SECRET_MAJOR@ \
@@ -275,9 +279,9 @@ VALA_TESTS = \
 
 SUFFIXES = .vala .vala.o
 
-test-vala-lang.vala.o: libsecret/test-vala-lang.vala
+test-vala-lang.vala.o: libsecret/test-vala-lang.vala $(VALA_TESTS_VAPIS)
        $(VALA_V) $(VALAC) --compile $(VALA_TESTS_FLAGS) $<
-test-vala-unstable.vala.o: libsecret/test-vala-unstable.vala
+test-vala-unstable.vala.o: libsecret/test-vala-unstable.vala $(VALA_TESTS_VAPIS)
        $(VALA_V) $(VALAC) --compile $(VALA_TESTS_FLAGS) $<
 
 test_vala_lang_SOURCES =