Use AM_CPPFLAGS instead of INCLUDES

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

diff --git a/libsecret/tests/Makefile.am b/libsecret/tests/Makefile.am
index 803c8dc..7f75206 100644 (file)
--- a/libsecret/tests/Makefile.am
+++ b/libsecret/tests/Makefile.am
@@ -1,6 +1,10 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = \
+# test-vala-unstable depends on the mock vapi,
+# and I'm not sure how we can add that dependency.
+.NOTPARALLEL:
+
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/libsecret \
        -DSRCDIR="\"@abs_srcdir@\"" \
@@ -21,17 +25,15 @@ libmock_service_la_LDFLAGS = \
        -rpath /force/shared
 
 libmock_service_la_LIBADD = \
-       $(top_builddir)/egg/libegg.la \
-       $(top_builddir)/libsecret/libsecret-@SECRET_MAJOR@.la \
        $(LIBGCRYPT_LIBS)
 
 LDADD =  \
-       $(top_builddir)/egg/libegg.la \
-       $(top_builddir)/libsecret/libsecret-@SECRET_MAJOR@.la \
+       $(top_builddir)/libsecret/libsecret-testable.la \
        libmock_service.la \
        $(NULL)
 
 C_TESTS = \
+       test-attributes \
        test-value \
        test-prompt \
        test-service \
@@ -55,7 +57,7 @@ noinst_PROGRAMS =  \
 
 JS_TESTS = \
        test-lookup-password.js \
-       test-remove-password.js \
+       test-clear-password.js \
        test-store-password.js \
        test-unstable.js
 
@@ -65,13 +67,14 @@ JS_ENV = \
 
 PY_TESTS = \
        test-lookup-password.py \
-       test-remove-password.py \
+       test-clear-password.py \
        test-store-password.py \
        test-unstable.py
 
 PY_ENV = $(JS_ENV)
 
-if HAVE_VALAC
+# ------------------------------------------------------------------
+# VALA
 
 VALA_V = $(VALA_V_$(V))
 VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY))
@@ -89,36 +92,40 @@ VALA_FLAGS = \
 VALA_TESTS_VAPIS = \
        $(builddir)/../libsecret-unstable.vapi \
        $(builddir)/../libsecret-@SECRET_MAJOR@.vapi \
-       mock-service-0.vapi
+       $(builddir)/mock-service-0.vapi
 
 VALA_SRCS = $(VALA_TESTS:=.vala)
+VALA_C_SRCS = $(VALA_SRCS:.vala=.c)
 
-.vala.c: $(VALA_TESTS_VAPIS)
+if HAVE_VALAC
+$(VALA_C_SRCS): %.c: %.vala $(VALA_TESTS_VAPIS)
        $(VALA_V)$(VALAC) $(VALA_FLAGS) $(VALA_TESTS_VAPIS) -C $<
-
-if HAVE_INTROSPECTION
-if ENABLE_VAPIGEN
-
-TEST_PROGS += $(VALA_TESTS)
-
-endif
 endif
 
 test_vala_lang_CFLAGS = -w
 test_vala_unstable_CFLAGS = -DSECRET_WITH_UNSTABLE -w
 
-DISTCLEANFILES = \
-       test-vala-lang.c \
-       test-vala-unstable.c
+nodist_test_vala_lang_SOURCES = test-vala-lang.c
+nodist_test_vala_unstable_SOURCES = test-vala-unstable.c
+
+DISTCLEANFILES = $(VALA_C_SRCS)
 
 test-vala: $(VALA_TESTS)
        @gtester --verbose -m $(TEST_MODE) --g-fatal-warnings $(VALA_TESTS)
 
-else
+VALA_TEST_TARGET =
+
+if HAVE_INTROSPECTION
+if ENABLE_VAPIGEN
+if HAVE_VALAC
+
+VALA_TEST_TARGET += test-vala
 
-test-vala:
+TEST_PROGS += $(VALA_TESTS)
 
 endif # HAVE_VALAC
+endif # ENABLE_VAPIGEN
+endif # HAVE_INTROSPECTION
 
 test-c: $(C_TESTS)
        @gtester --verbose -m $(TEST_MODE) --g-fatal-warnings $(C_TESTS)
@@ -129,7 +136,7 @@ test-js:
 test-py:
        @for py in $(PY_TESTS); do echo "TEST: $$py"; $(PY_ENV) python $(srcdir)/$$py; done
 
-test: test-c test-py test-js test-vala
+test: test-c test-py test-js $(VALA_TEST_TARGET)
 
 # ------------------------------------------------------------------
 # INTROSPECTION
@@ -181,11 +188,11 @@ endif # HAVE_INTROSPECTION
 EXTRA_DIST = \
        mock \
        mock-service-delete.py \
+       mock-service-empty.py \
        mock-service-lock.py \
        mock-service-normal.py \
        mock-service-only-plain.py \
        mock-service-prompt.py \
-       Secret-@SECRET_MAJOR@.metadata \
        $(VALA_SRCS) \
        $(JS_TESTS) \
        $(PY_TESTS) \