all Makefiles: don't ignore or clean .c files not corresponding to Vala

This will become more important if we use C to implement fast-paths
and faster data structures.

Bug: https://bugzilla.gnome.org/show_bug.cgi?id=695381
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Philip Withnall <philip@tecnocode.co.uk>

diff --git a/backends/eds/Makefile.am b/backends/eds/Makefile.am
index 55042b5..3bdcc03 100644 (file)
--- a/backends/eds/Makefile.am
+++ b/backends/eds/Makefile.am
@@ -76,7 +76,7 @@ eds_la_LDFLAGS = \
 
 GITIGNOREFILES = \
        folks-backend-eds.vapi \
-       $(eds_la_SOURCES:.vala=.c) \
+       $(patsubst %.vala,%.c,$(filter %.vala,$(eds_la_SOURCES))) \
        eds_la_vala.stamp \
        $(NULL)
 

diff --git a/backends/key-file/Makefile.am b/backends/key-file/Makefile.am
index ffc25cd..1cdcda2 100644 (file)
--- a/backends/key-file/Makefile.am
+++ b/backends/key-file/Makefile.am
@@ -59,7 +59,7 @@ key_file_la_LDFLAGS = \
 
 GITIGNOREFILES = \
        folks-backend-key-file.vapi \
-       $(key_file_la_SOURCES:.vala=.c) \
+       $(patsubst %.vala,%.c,$(filter %.vala,$(key_file_la_SOURCES))) \
        key_file_la_vala.stamp \
        $(NULL)
 

diff --git a/backends/libsocialweb/Makefile.am b/backends/libsocialweb/Makefile.am
index f7229b1..eb051b5 100644 (file)
--- a/backends/libsocialweb/Makefile.am
+++ b/backends/libsocialweb/Makefile.am
@@ -70,7 +70,7 @@ libsocialweb_la_LDFLAGS = \
 
 GITIGNOREFILES = \
        folks-backend-libsocialweb.vapi \
-       $(libsocialweb_la_SOURCES:.vala=.c) \
+       $(patsubst %.vala,%.c,$(filter %.vala,$(libsocialweb_la_SOURCES))) \
        libsocialweb_la_vala.stamp \
        $(NULL)
 

diff --git a/backends/ofono/Makefile.am b/backends/ofono/Makefile.am
index 651a964..1a9a210 100644 (file)
--- a/backends/ofono/Makefile.am
+++ b/backends/ofono/Makefile.am
@@ -67,7 +67,7 @@ ofono_la_LDFLAGS = \
        $(NULL)
 
 GITIGNOREFILES = \
-       $(ofono_la_SOURCES:.vala=.c) \
+       $(patsubst %.vala,%.c,$(filter %.vala,$(ofono_la_SOURCES))) \
        ofono_la_vala.stamp \
        $(NULL)
 

diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am
index 431c154..899f54e 100644 (file)
--- a/backends/telepathy/Makefile.am
+++ b/backends/telepathy/Makefile.am
@@ -73,7 +73,7 @@ telepathy_la_LDFLAGS = \
 
 GITIGNOREFILES = \
        folks-backend-telepathy.vapi \
-       $(telepathy_la_SOURCES:.vala=.c) \
+       $(patsubst %.vala,%.c,$(filter %.vala,$(telepathy_la_SOURCES))) \
        telepathy_la_vala.stamp \
        $(NULL)
 

diff --git a/backends/tracker/Makefile.am b/backends/tracker/Makefile.am
index 1ab955d..aeaa047 100644 (file)
--- a/backends/tracker/Makefile.am
+++ b/backends/tracker/Makefile.am
@@ -71,7 +71,7 @@ tracker_la_LDFLAGS = \
 
 GITIGNOREFILES = \
        folks-backend-tracker.vapi \
-       $(tracker_la_SOURCES:.vala=.c) \
+       $(patsubst %.vala,%.c,$(filter %.vala,$(tracker_la_SOURCES))) \
        tracker_la_vala.stamp \
        $(NULL)
 

diff --git a/folks/Makefile.am b/folks/Makefile.am
index be47f57..b255e39 100644 (file)
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -174,9 +174,9 @@ BUILT_SOURCES = \
        $(NULL)
 
 GITIGNOREFILES = \
-       $(libfolks_la_SOURCES:.vala=.c) \
+       $(patsubst %.vala,%.c,$(filter %.vala,$(libfolks_la_SOURCES))) \
+       $(patsubst %.vala,%.c,$(filter %.vala,$(libfolks_internal_la_SOURCES))) \
        libfolks_la_vala.stamp \
-       $(libfolks_internal_la_SOURCES:.vala=.c) \
        libfolks_internal_la_vala.stamp \
        $(NULL)
 

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index ea56cf0..2b0b314 100644 (file)
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -76,7 +76,7 @@ BUILT_SOURCES = \
        $(NULL)
 
 MAINTAINERCLEANFILES = \
-       $(libfolks_test_la_SOURCES:.vala=.c) \
+       $(patsubst %.vala,%.c,$(filter %.vala,$(libfolks_test_la_SOURCES))) \
        libfolks_test_la_vala.stamp \
        folks-test.h \
        folks-test.vapi \

diff --git a/tests/lib/eds/Makefile.am b/tests/lib/eds/Makefile.am
index c2cb103..afa7757 100644 (file)
--- a/tests/lib/eds/Makefile.am
+++ b/tests/lib/eds/Makefile.am
@@ -60,7 +60,7 @@ EXTRA_DIST = \
        $(NULL)
 
 GITIGNOREFILES = \
-       $(libeds_test_la_SOURCES:.vala=.c) \
+       $(patsubst %.vala,%.c,$(filter %.vala,$(libeds_test_la_SOURCES))) \
        libeds_test_la_vala.stamp \
        $(NULL)
 

diff --git a/tests/lib/key-file/Makefile.am b/tests/lib/key-file/Makefile.am
index fe53b41..5249215 100644 (file)
--- a/tests/lib/key-file/Makefile.am
+++ b/tests/lib/key-file/Makefile.am
@@ -44,7 +44,7 @@ EXTRA_DIST = \
        $(NULL)
 
 GITIGNOREFILES = \
-       $(libkf_test_la_SOURCES:.vala=.c) \
+       $(patsubst %.vala,%.c,$(filter %.vala,$(libkf_test_la_SOURCES))) \
        libkf_test_la_vala.stamp \
        $(NULL)
 

diff --git a/tests/lib/libsocialweb/Makefile.am b/tests/lib/libsocialweb/Makefile.am
index f1bf8ce..d3520ee 100644 (file)
--- a/tests/lib/libsocialweb/Makefile.am
+++ b/tests/lib/libsocialweb/Makefile.am
@@ -58,7 +58,7 @@ EXTRA_DIST = \
        $(NULL)
 
 GITIGNOREFILES = \
-       $(libsocialweb_test_la_SOURCES:.vala=.c) \
+       $(patsubst %.vala,%.c,$(filter %.vala,$(libsocialweb_test_la_SOURCES))) \
        libsocialweb_test_la_vala.stamp \
        $(NULL)
 

diff --git a/tests/lib/telepathy/Makefile.am b/tests/lib/telepathy/Makefile.am
index 0986476..9fc4ae5 100644 (file)
--- a/tests/lib/telepathy/Makefile.am
+++ b/tests/lib/telepathy/Makefile.am
@@ -63,7 +63,7 @@ BUILT_SOURCES = \
        $(NULL)
 
 GITIGNOREFILES = \
-       $(libtpf_test_la_SOURCES:.vala=.c) \
+       $(patsubst %.vala,%.c,$(filter %.vala,$(libtpf_test_la_SOURCES))) \
        libtpf_test_la_vala.stamp \
        $(NULL)
 

diff --git a/tests/lib/tracker/Makefile.am b/tests/lib/tracker/Makefile.am
index 51c154a..0870ad0 100644 (file)
--- a/tests/lib/tracker/Makefile.am
+++ b/tests/lib/tracker/Makefile.am
@@ -63,7 +63,7 @@ EXTRA_DIST = \
        $(NULL)
 
 GITIGNOREFILES = \
-       $(libtracker_test_la_SOURCES:.vala=.c) \
+       $(patsubst %.vala,%.c,$(filter %.vala,$(libtracker_test_la_SOURCES))) \
        libtracker_test_la_vala.stamp \
        $(NULL)
 

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 731908e..9ecbaaa 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -47,7 +47,7 @@ folks_import_LDADD = \
 
 GITIGNOREFILES = \
        folks_import_vala.stamp \
-       $(folks_import_SOURCES:.vala=.c) \
+       $(patsubst %.vala,%.c,$(filter %.vala,$(folks_import_SOURCES))) \
        $(NULL)
 
 -include $(top_srcdir)/git.mk

diff --git a/tools/inspect/Makefile.am b/tools/inspect/Makefile.am
index 376b9d0..3681fa9 100644 (file)
--- a/tools/inspect/Makefile.am
+++ b/tools/inspect/Makefile.am
@@ -51,7 +51,7 @@ folks_inspect_CFLAGS = \
 
 GITIGNOREFILES = \
        folks_inspect_vala.stamp \
-       $(folks_inspect_SOURCES:.vala=.c) \
+       $(patsubst %.vala,%.c,$(filter %.vala,$(folks_inspect_SOURCES))) \
        $(NULL)
 
 -include $(top_srcdir)/git.mk