[folks/648811-dummy-backend-rebase1: 46/48] dummy: Update test library Makefile.am

[Philip Withnall <pwithnall src gnome org>]

commit f5d2c922428bb7ac9fec12fe565be0a1001ec8e4
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Thu Nov 7 10:21:35 2013 +0000

    dummy: Update test library Makefile.am

 tests/lib/dummy/Makefile.am |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/tests/lib/dummy/Makefile.am b/tests/lib/dummy/Makefile.am
index a90d068..a452267 100644
--- a/tests/lib/dummy/Makefile.am
+++ b/tests/lib/dummy/Makefile.am
@@ -1,59 +1,59 @@
-AM_VALAFLAGS += \
+noinst_LTLIBRARIES = libdummy-test.la
+
+libdummy_test_la_VALAFLAGS = \
+       $(AM_VALAFLAGS) \
        $(ERROR_VALAFLAGS) \
-       --library=dummy-test \
-       --header=dummy-test.h \
+       --library dummy-test \
+       --vapi dumy-test.vapi \
+       --header dummy-test.h \
        --vapidir=$(top_srcdir)/folks \
        --vapidir=$(top_srcdir)/backends/dummy/lib \
        --vapidir=$(top_srcdir)/backends/dummy/vapi \
        --vapidir=$(abs_top_srcdir)/tests/lib \
        --vapidir=$(abs_top_builddir)/tests/lib \
        --vapidir=. \
+       --pkg gobject-2.0 \
+       --pkg gio-2.0 \
        --pkg gee-0.8 \
+       --pkg folks \
        --pkg folks-dummy \
        --pkg folks-test \
        -g \
        $(NULL)
 
-noinst_LTLIBRARIES = libdummy-test.la
-
 libdummy_test_la_SOURCES = \
        test-case.vala \
        $(NULL)
 
+libdummy_test_la_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -include $(top_srcdir)/folks/warnings.h \
+       $(NULL)
+
 libdummy_test_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(ERROR_CFLAGS) \
+       $(GLIB_CFLAGS) \
+       $(GEE_CFLAGS) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/folks \
        -I$(top_srcdir)/tests/lib \
        -I$(top_srcdir)/backends/dummy/lib \
        -I$(top_srcdir)/backends/dummy/lib/folks \
-       $(AM_CFLAGS) \
-       $(ERROR_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(GEE_CFLAGS) \
+       -I$(top_srcdir)/tests/lib \
        $(NULL)
 
 libdummy_test_la_LIBADD = \
        $(top_builddir)/folks/libfolks.la \
-       $(top_builddir)/tests/lib/libfolks-test.la \
        $(top_builddir)/backends/dummy/lib/libfolks-dummy.la \
+       $(top_builddir)/tests/lib/libfolks-test.la \
        $(GLIB_LIBS) \
        $(GEE_LIBS) \
        $(NULL)
 
-MAINTAINERCLEANFILES = \
-       dummy-test.vapi \
-       dummy-test.h \
-       $(NULL)
-
 EXTRA_DIST = \
-       dummy-test.deps \
        dummy-test.vapi \
        dummy-test.h \
        $(NULL)
 
-GITIGNOREFILES = \
-       $(patsubst %.vala,%.c,$(filter %.vala,$(libdummy_test_la_SOURCES))) \
-       libdummy_test_la_vala.stamp \
-       $(NULL)
-
 -include $(top_srcdir)/git.mk