diff options
-rw-r--r-- | backends/eds/Makefile.am | 6 | ||||
-rw-r--r-- | backends/key-file/Makefile.am | 6 | ||||
-rw-r--r-- | backends/libsocialweb/Makefile.am | 6 | ||||
-rw-r--r-- | backends/ofono/Makefile.am | 5 | ||||
-rw-r--r-- | backends/telepathy/Makefile.am | 6 | ||||
-rw-r--r-- | backends/tracker/Makefile.am | 6 | ||||
-rw-r--r-- | folks/Makefile.am | 9 | ||||
-rw-r--r-- | tests/lib/Makefile.am | 5 | ||||
-rw-r--r-- | tests/lib/eds/Makefile.am | 5 | ||||
-rw-r--r-- | tests/lib/key-file/Makefile.am | 5 | ||||
-rw-r--r-- | tests/lib/libsocialweb/Makefile.am | 5 | ||||
-rw-r--r-- | tests/lib/telepathy/Makefile.am | 4 | ||||
-rw-r--r-- | tests/lib/tracker/Makefile.am | 5 | ||||
-rw-r--r-- | tools/Makefile.am | 5 | ||||
-rw-r--r-- | tools/inspect/Makefile.am | 5 |
15 files changed, 6 insertions, 77 deletions
diff --git a/backends/eds/Makefile.am b/backends/eds/Makefile.am index 5d4d8a50..60c9426a 100644 --- a/backends/eds/Makefile.am +++ b/backends/eds/Makefile.am @@ -74,11 +74,5 @@ eds_la_LDFLAGS = \ -avoid-version \ $(NULL) -GITIGNOREFILES = \ - folks-backend-eds.vapi \ - $(patsubst %.vala,%.c,$(filter %.vala,$(eds_la_SOURCES))) \ - eds_la_vala.stamp \ - $(NULL) - -include backend.mk -include $(top_srcdir)/git.mk diff --git a/backends/key-file/Makefile.am b/backends/key-file/Makefile.am index a139d55d..cfa02242 100644 --- a/backends/key-file/Makefile.am +++ b/backends/key-file/Makefile.am @@ -58,10 +58,4 @@ key_file_la_LDFLAGS = \ -avoid-version \ $(NULL) -GITIGNOREFILES = \ - folks-backend-key-file.vapi \ - $(patsubst %.vala,%.c,$(filter %.vala,$(key_file_la_SOURCES))) \ - key_file_la_vala.stamp \ - $(NULL) - -include $(top_srcdir)/git.mk diff --git a/backends/libsocialweb/Makefile.am b/backends/libsocialweb/Makefile.am index 1d2bd70c..67a35292 100644 --- a/backends/libsocialweb/Makefile.am +++ b/backends/libsocialweb/Makefile.am @@ -68,10 +68,4 @@ libsocialweb_la_LDFLAGS = \ -avoid-version \ $(NULL) -GITIGNOREFILES = \ - folks-backend-libsocialweb.vapi \ - $(patsubst %.vala,%.c,$(filter %.vala,$(libsocialweb_la_SOURCES))) \ - libsocialweb_la_vala.stamp \ - $(NULL) - -include $(top_srcdir)/git.mk diff --git a/backends/ofono/Makefile.am b/backends/ofono/Makefile.am index 2ecc8cde..4151daf6 100644 --- a/backends/ofono/Makefile.am +++ b/backends/ofono/Makefile.am @@ -67,9 +67,4 @@ ofono_la_LDFLAGS = \ -avoid-version \ $(NULL) -GITIGNOREFILES = \ - $(patsubst %.vala,%.c,$(filter %.vala,$(ofono_la_SOURCES))) \ - ofono_la_vala.stamp \ - $(NULL) - -include $(top_srcdir)/git.mk diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am index cd058601..0e5bf5a3 100644 --- a/backends/telepathy/Makefile.am +++ b/backends/telepathy/Makefile.am @@ -71,10 +71,4 @@ telepathy_la_LDFLAGS = \ -avoid-version \ $(NULL) -GITIGNOREFILES = \ - folks-backend-telepathy.vapi \ - $(patsubst %.vala,%.c,$(filter %.vala,$(telepathy_la_SOURCES))) \ - telepathy_la_vala.stamp \ - $(NULL) - -include $(top_srcdir)/git.mk diff --git a/backends/tracker/Makefile.am b/backends/tracker/Makefile.am index 60fa2742..4fa10d32 100644 --- a/backends/tracker/Makefile.am +++ b/backends/tracker/Makefile.am @@ -69,10 +69,4 @@ tracker_la_LDFLAGS = \ -avoid-version \ $(NULL) -GITIGNOREFILES = \ - folks-backend-tracker.vapi \ - $(patsubst %.vala,%.c,$(filter %.vala,$(tracker_la_SOURCES))) \ - tracker_la_vala.stamp \ - $(NULL) - -include $(top_srcdir)/git.mk diff --git a/folks/Makefile.am b/folks/Makefile.am index ae6d456f..f91f3d74 100644 --- a/folks/Makefile.am +++ b/folks/Makefile.am @@ -180,13 +180,6 @@ BUILT_SOURCES = \ folks.vapi \ $(NULL) -GITIGNOREFILES = \ - $(patsubst %.vala,%.c,$(filter %.vala,$(libfolks_la_SOURCES))) \ - $(patsubst %.vala,%.c,$(filter %.vala,$(libfolks_internal_la_SOURCES))) \ - libfolks_la_vala.stamp \ - libfolks_internal_la_vala.stamp \ - $(NULL) - CLEANFILES = MAINTAINERCLEANFILES = @@ -233,6 +226,6 @@ convert_DATA = folks.convert EXTRA_DIST += $(convert_DATA) CLEANFILES += $(gsettings_SCHEMAS) -GITIGNOREFILES += org.freedesktop.folks.gschema.valid +GITIGNOREFILES = org.freedesktop.folks.gschema.valid -include $(top_srcdir)/git.mk diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 74122879..efd22de2 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -100,6 +100,11 @@ MAINTAINERCLEANFILES = \ folks-test.vapi \ $(NULL) +# Too hard to add support for this in git.mk. +GITIGNOREFILES = \ + folks-test-internal.h \ + $(NULL) + EXTRA_DIST = \ folks-test.deps \ $(MAINTAINERCLEANFILES) \ diff --git a/tests/lib/eds/Makefile.am b/tests/lib/eds/Makefile.am index 1a9a6090..7157b09f 100644 --- a/tests/lib/eds/Makefile.am +++ b/tests/lib/eds/Makefile.am @@ -61,9 +61,4 @@ EXTRA_DIST = \ eds-test.h \ $(NULL) -GITIGNOREFILES = \ - $(patsubst %.vala,%.c,$(filter %.vala,$(libeds_test_la_SOURCES))) \ - libeds_test_la_vala.stamp \ - $(NULL) - -include $(top_srcdir)/git.mk diff --git a/tests/lib/key-file/Makefile.am b/tests/lib/key-file/Makefile.am index b351eb2d..e7de2a5b 100644 --- a/tests/lib/key-file/Makefile.am +++ b/tests/lib/key-file/Makefile.am @@ -45,9 +45,4 @@ EXTRA_DIST = \ kf-test.h \ $(NULL) -GITIGNOREFILES = \ - $(patsubst %.vala,%.c,$(filter %.vala,$(libkf_test_la_SOURCES))) \ - libkf_test_la_vala.stamp \ - $(NULL) - -include $(top_srcdir)/git.mk diff --git a/tests/lib/libsocialweb/Makefile.am b/tests/lib/libsocialweb/Makefile.am index 8dcf8cdf..daf53467 100644 --- a/tests/lib/libsocialweb/Makefile.am +++ b/tests/lib/libsocialweb/Makefile.am @@ -54,9 +54,4 @@ EXTRA_DIST = \ libsocialweb-test.h \ $(NULL) -GITIGNOREFILES = \ - $(patsubst %.vala,%.c,$(filter %.vala,$(libsocialweb_test_la_SOURCES))) \ - libsocialweb_test_la_vala.stamp \ - $(NULL) - -include $(top_srcdir)/git.mk diff --git a/tests/lib/telepathy/Makefile.am b/tests/lib/telepathy/Makefile.am index 8f2e0fc2..cd5368f1 100644 --- a/tests/lib/telepathy/Makefile.am +++ b/tests/lib/telepathy/Makefile.am @@ -64,9 +64,5 @@ BUILT_SOURCES = \ libtpf_test_la_vala.stamp \ $(NULL) -GITIGNOREFILES = \ - $(patsubst %.vala,%.c,$(filter %.vala,$(libtpf_test_la_SOURCES))) \ - libtpf_test_la_vala.stamp \ - $(NULL) -include $(top_srcdir)/git.mk diff --git a/tests/lib/tracker/Makefile.am b/tests/lib/tracker/Makefile.am index 2b09076d..14f23582 100644 --- a/tests/lib/tracker/Makefile.am +++ b/tests/lib/tracker/Makefile.am @@ -64,9 +64,4 @@ EXTRA_DIST = \ tracker-test.h \ $(NULL) -GITIGNOREFILES = \ - $(patsubst %.vala,%.c,$(filter %.vala,$(libtracker_test_la_SOURCES))) \ - libtracker_test_la_vala.stamp \ - $(NULL) - -include $(top_srcdir)/git.mk diff --git a/tools/Makefile.am b/tools/Makefile.am index 1eeb9ca3..3dcd01fc 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -46,9 +46,4 @@ folks_import_LDADD = \ $(top_builddir)/folks/libfolks.la \ $(NULL) -GITIGNOREFILES = \ - folks_import_vala.stamp \ - $(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 5d9c932e..05f27d7b 100644 --- a/tools/inspect/Makefile.am +++ b/tools/inspect/Makefile.am @@ -50,9 +50,4 @@ folks_inspect_CFLAGS = \ $(GEE_CFLAGS) \ $(NULL) -GITIGNOREFILES = \ - folks_inspect_vala.stamp \ - $(patsubst %.vala,%.c,$(filter %.vala,$(folks_inspect_SOURCES))) \ - $(NULL) - -include $(top_srcdir)/git.mk |