From 9423e5e214110e3d4d3b77482db87a0ec310599b Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 20 Jun 2013 17:26:02 +0100 Subject: [PATCH] build: Remove generated C/H/vapi/stamp files from MAINTAINERCLEANFILES As long as --vapi and -H/-h options are correctly passed to a target-specific VALAFLAGS, automake will automatically add these generated files to the maintainer-clean target. Helps: https://bugzilla.gnome.org/show_bug.cgi?id=701099 --- backends/eds/lib/Makefile.am | 14 +------ backends/libsocialweb/lib/Makefile.am | 15 +------- backends/telepathy/lib/Makefile.am | 15 +------- backends/tracker/lib/Makefile.am | 15 +------- tests/eds/Makefile.am | 10 +---- tests/folks/Makefile.am | 23 ------------ tests/key-file/Makefile.am | 15 -------- tests/lib/Makefile.am | 9 +---- tests/lib/eds/Makefile.am | 5 --- tests/lib/key-file/Makefile.am | 5 --- tests/lib/libsocialweb/Makefile.am | 5 --- tests/lib/telepathy/Makefile.am | 11 ------ tests/lib/tracker/Makefile.am | 5 --- tests/libsocialweb/Makefile.am | 16 -------- tests/telepathy/Makefile.am | 11 ------ tests/tracker/Makefile.am | 69 ++--------------------------------- 16 files changed, 14 insertions(+), 229 deletions(-) diff --git a/backends/eds/lib/Makefile.am b/backends/eds/lib/Makefile.am index 3c5718b..e37a7cc 100644 --- a/backends/eds/lib/Makefile.am +++ b/backends/eds/lib/Makefile.am @@ -26,17 +26,13 @@ pkgconfig_in = folks-eds.pc.in pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(pkgconfig_in:.in=) -folks_eds_valasources = \ +libfolks_eds_la_SOURCES = \ edsf-namespace.vala \ edsf-persona.vala \ edsf-persona-store.vala \ memory-icon.vala \ $(NULL) -libfolks_eds_la_SOURCES = \ - $(folks_eds_valasources) \ - $(NULL) - libfolks_eds_la_VALAFLAGS = \ $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ @@ -106,13 +102,7 @@ dist_vapi_DATA = \ ################################################################## CLEANFILES = -MAINTAINERCLEANFILES = \ - $(folks_eds_valasources:.vala=.c) \ - libfolks_eds_la_vala.stamp \ - folks/folks-eds.h \ - folks-eds.vapi \ - $(NULL) - +MAINTAINERCLEANFILES = EXTRA_DIST = \ $(pkgconfig_in) \ $(MAINTAINERCLEANFILES) \ diff --git a/backends/libsocialweb/lib/Makefile.am b/backends/libsocialweb/lib/Makefile.am index f07cb60..37c27ff 100644 --- a/backends/libsocialweb/lib/Makefile.am +++ b/backends/libsocialweb/lib/Makefile.am @@ -25,16 +25,12 @@ pkgconfig_in = folks-libsocialweb.pc.in pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(pkgconfig_in:.in=) -folks_libsocialweb_valasources = \ +libfolks_libsocialweb_la_SOURCES = \ swf-namespace.vala \ swf-persona.vala \ swf-persona-store.vala \ $(NULL) -libfolks_libsocialweb_la_SOURCES = \ - $(folks_libsocialweb_valasources) \ - $(NULL) - libfolks_libsocialweb_la_VALAFLAGS = \ $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ @@ -94,14 +90,7 @@ dist_vapi_DATA = \ ################################################################## CLEANFILES = -MAINTAINERCLEANFILES = \ - $(folks_libsocialweb_valasources:.vala=.c) \ - libfolks_libsocialweb_la_vala.stamp \ - folks/folks-libsocialweb.h \ - folks-libsocialweb.vapi \ - $(dist_noinst_DATA) \ - $(NULL) - +MAINTAINERCLEANFILES = EXTRA_DIST = \ $(pkgconfig_in) \ $(MAINTAINERCLEANFILES) \ diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am index 020af79..3002f5a 100644 --- a/backends/telepathy/lib/Makefile.am +++ b/backends/telepathy/lib/Makefile.am @@ -80,16 +80,12 @@ pkgconfig_DATA = $(pkgconfig_in:.in=) $(srcdir)/libfolks_telepathy_la_vala.stamp: tp-lowlevel.vapi -folks_telepathy_valasources = \ +libfolks_telepathy_la_SOURCES = \ tpf-namespace.vala \ tpf-persona.vala \ tpf-persona-store.vala \ tpf-logger.vala \ tpf-persona-store-cache.vala \ - $(NULL) - -libfolks_telepathy_la_SOURCES = \ - $(folks_telepathy_valasources) \ tp-lowlevel.c \ $(NULL) @@ -167,14 +163,7 @@ DISTCLEANFILES = $(dist_noinst_DATA) endif CLEANFILES = -MAINTAINERCLEANFILES = \ - $(folks_telepathy_valasources:.vala=.c) \ - libfolks_telepathy_la_vala.stamp \ - folks/folks-telepathy.h \ - folks-telepathy.vapi \ - $(dist_noinst_DATA) \ - $(NULL) - +MAINTAINERCLEANFILES = EXTRA_DIST = \ $(libtp_lowlevel_la_SOURCES) \ $(pkgconfig_in) \ diff --git a/backends/tracker/lib/Makefile.am b/backends/tracker/lib/Makefile.am index 470d673..d7ec293 100644 --- a/backends/tracker/lib/Makefile.am +++ b/backends/tracker/lib/Makefile.am @@ -7,17 +7,13 @@ pkgconfig_in = folks-tracker.pc.in pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(pkgconfig_in:.in=) -folks_tracker_valasources = \ +libfolks_tracker_la_SOURCES = \ trf-namespace.vala \ trf-persona.vala \ trf-persona-store.vala \ trf-util.vala \ $(NULL) -libfolks_tracker_la_SOURCES = \ - $(folks_tracker_valasources) \ - $(NULL) - libfolks_tracker_la_VALAFLAGS = \ $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ @@ -90,14 +86,7 @@ dist_vapi_DATA = \ ################################################################## CLEANFILES = -MAINTAINERCLEANFILES = \ - $(folks_tracker_valasources:.vala=.c) \ - libfolks_tracker_la_vala.stamp \ - folks/folks-tracker.h \ - folks-tracker.vapi \ - $(dist_noinst_DATA) \ - $(NULL) - +MAINTAINERCLEANFILES = EXTRA_DIST = \ $(pkgconfig_in) \ $(MAINTAINERCLEANFILES) \ diff --git a/tests/eds/Makefile.am b/tests/eds/Makefile.am index 4316b90..08f9275 100644 --- a/tests/eds/Makefile.am +++ b/tests/eds/Makefile.am @@ -248,14 +248,8 @@ helper_prepare_aggregator_SOURCES = \ $(NULL) CLEANFILES = \ - *.pid \ - *.address \ - $(TESTS) \ - $(NULL) - -MAINTAINERCLEANFILES = \ - $(addsuffix .c,$(noinst_PROGRAMS)) \ - $(addsuffix _vala.stamp,$(subst -,_,$(noinst_PROGRAMS))) \ + *.pid \ + *.address \ $(NULL) EXTRA_DIST = \ diff --git a/tests/folks/Makefile.am b/tests/folks/Makefile.am index 6e82959..336483d 100644 --- a/tests/folks/Makefile.am +++ b/tests/folks/Makefile.am @@ -111,29 +111,6 @@ small_set_SOURCES = \ small-set.vala \ $(NULL) -CLEANFILES = \ - *.pid \ - *.address \ - $(TESTS) \ - $(NULL) - -MAINTAINERCLEANFILES = \ - $(addsuffix .c,$(noinst_PROGRAMS)) \ - backend_loading_vala.stamp \ - aggregation_vala.stamp \ - abstract_field_details_vala.stamp \ - async_locking_vala.stamp \ - utils_vala.stamp \ - avatar_cache_vala.stamp \ - object_cache_vala.stamp \ - init_vala.stamp \ - small_set_vala.stamp \ - $(NULL) - -EXTRA_DIST = \ - $(MAINTAINERCLEANFILES) \ - $(NULL) - -include $(top_srcdir)/git.mk -include $(top_srcdir)/valgrind.mk -include $(top_srcdir)/check.mk diff --git a/tests/key-file/Makefile.am b/tests/key-file/Makefile.am index 5f562c5..b10e1c4 100644 --- a/tests/key-file/Makefile.am +++ b/tests/key-file/Makefile.am @@ -46,21 +46,6 @@ individual_retrieval_SOURCES = \ individual-retrieval.vala \ $(NULL) -CLEANFILES = \ - *.pid \ - *.address \ - $(TESTS) \ - $(NULL) - -MAINTAINERCLEANFILES = \ - $(addsuffix .c,$(noinst_PROGRAMS)) \ - individual_retrieval_vala.stamp \ - $(NULL) - -EXTRA_DIST = \ - $(MAINTAINERCLEANFILES) \ - $(NULL) - -include $(top_srcdir)/git.mk -include $(top_srcdir)/valgrind.mk -include $(top_srcdir)/check.mk diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 0ce1099..bbd5244 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -98,17 +98,10 @@ BUILT_SOURCES = \ folks-test-internal.h \ $(NULL) -MAINTAINERCLEANFILES = \ - $(patsubst %.vala,%.c,$(filter %.vala,$(libfolks_test_la_SOURCES))) \ - libfolks_test_la_vala.stamp \ - folks-test.h \ - folks-test.vapi \ - $(NULL) - # Too hard to add support for this in git.mk. GITIGNOREFILES = \ folks-test-internal.h \ - $(NULL) + $(NULL) EXTRA_DIST = \ folks-test.deps \ diff --git a/tests/lib/eds/Makefile.am b/tests/lib/eds/Makefile.am index 6cc994c..a09beaf 100644 --- a/tests/lib/eds/Makefile.am +++ b/tests/lib/eds/Makefile.am @@ -53,11 +53,6 @@ libeds_test_la_LIBADD = \ $(GEE_LIBS) \ $(NULL) -MAINTAINERCLEANFILES = \ - eds-test.vapi \ - eds-test.h \ - $(NULL) - EXTRA_DIST = \ eds-test.vapi \ eds-test.h \ diff --git a/tests/lib/key-file/Makefile.am b/tests/lib/key-file/Makefile.am index 52a3047..6bb4844 100644 --- a/tests/lib/key-file/Makefile.am +++ b/tests/lib/key-file/Makefile.am @@ -36,11 +36,6 @@ libkf_test_la_LIBADD = \ $(GEE_LIBS) \ $(NULL) -MAINTAINERCLEANFILES = \ - kf-test.vapi \ - kf-test.h \ - $(NULL) - EXTRA_DIST = \ kf-test.deps \ kf-test.vapi \ diff --git a/tests/lib/libsocialweb/Makefile.am b/tests/lib/libsocialweb/Makefile.am index 4f2e31c..311c5cc 100644 --- a/tests/lib/libsocialweb/Makefile.am +++ b/tests/lib/libsocialweb/Makefile.am @@ -46,11 +46,6 @@ libsocialweb_test_la_LIBADD = \ $(top_builddir)/tests/lib/libfolks-test.la \ $(NULL) -MAINTAINERCLEANFILES = \ - libsocialweb-test.vapi \ - libsocialweb-test.h \ - $(NULL) - EXTRA_DIST = \ libsocialweb-test.vapi \ libsocialweb-test.h \ diff --git a/tests/lib/telepathy/Makefile.am b/tests/lib/telepathy/Makefile.am index 1174bcc..19d72e2 100644 --- a/tests/lib/telepathy/Makefile.am +++ b/tests/lib/telepathy/Makefile.am @@ -51,17 +51,6 @@ libtpf_test_la_LIBADD = \ $(TP_GLIB_LIBS) \ $(NULL) -MAINTAINERCLEANFILES = \ - tpf-test.vapi \ - tpf-test.h \ - $(NULL) - -EXTRA_DIST = \ - tpf-test.deps \ - tpf-test.vapi \ - tpf-test.h \ - $(NULL) - BUILT_SOURCES = \ libtpf_test_la_vala.stamp \ $(NULL) diff --git a/tests/lib/tracker/Makefile.am b/tests/lib/tracker/Makefile.am index ddd9549..7da6701 100644 --- a/tests/lib/tracker/Makefile.am +++ b/tests/lib/tracker/Makefile.am @@ -52,11 +52,6 @@ dist_noinst_DATA = \ tracker-test.vapi \ $(NULL) -MAINTAINERCLEANFILES = \ - tracker-test.vapi \ - tracker-test.h \ - $(NULL) - EXTRA_DIST = \ tracker-test.vapi \ tracker-test.h \ diff --git a/tests/libsocialweb/Makefile.am b/tests/libsocialweb/Makefile.am index 214bef8..c1f2e47 100644 --- a/tests/libsocialweb/Makefile.am +++ b/tests/libsocialweb/Makefile.am @@ -66,21 +66,5 @@ aggregation_SOURCES = \ aggregation.vala \ $(NULL) -CLEANFILES = \ - *.pid \ - *.address \ - $(TESTS) \ - $(NULL) - -MAINTAINERCLEANFILES = \ - $(addsuffix .c,$(noinst_PROGRAMS)) \ - dummy_lsw_vala.stamp \ - aggregation_vala.stamp \ - $(NULL) - -EXTRA_DIST = \ - $(MAINTAINERCLEANFILES) \ - $(NULL) - -include $(top_srcdir)/git.mk -include $(top_srcdir)/check.mk diff --git a/tests/telepathy/Makefile.am b/tests/telepathy/Makefile.am index 7049780..5eda26d 100644 --- a/tests/telepathy/Makefile.am +++ b/tests/telepathy/Makefile.am @@ -104,17 +104,6 @@ persona_store_capabilities_SOURCES = \ persona-store-capabilities.vala \ $(NULL) -CLEANFILES = \ - *.pid \ - *.address \ - $(TESTS) \ - $(NULL) - -MAINTAINERCLEANFILES = \ - $(BUILT_SOURCES) \ - $(addsuffix .c,$(noinst_PROGRAMS)) \ - $(NULL) - EXTRA_DIST = \ $(MAINTAINERCLEANFILES) \ $(srcdir)/data/relationships-empty.ini \ diff --git a/tests/tracker/Makefile.am b/tests/tracker/Makefile.am index a0443e3..f2b3e08 100644 --- a/tests/tracker/Makefile.am +++ b/tests/tracker/Makefile.am @@ -347,72 +347,9 @@ set_null_avatar_SOURCES = \ $(NULL) CLEANFILES = \ - *.pid \ - *.address \ - $(TESTS) \ - $(NULL) - -MAINTAINERCLEANFILES = \ - $(addsuffix .c,$(noinst_PROGRAMS)) \ - individual_retrieval_vala.stamp \ - name_details_interface_vala.stamp \ - avatar_details_interface_vala.stamp \ - im_details_interface_vala.stamp \ - phone_details_interface_vala.stamp \ - email_details_interface_vala.stamp \ - url_details_interface_vala.stamp \ - favourite_details_interface_vala.stamp \ - fullname_updates_vala.stamp \ - add_contact_vala.stamp \ - default_contact_vala.stamp \ - remove_contact_vala.stamp \ - nickname_updates_vala.stamp \ - family_name_updates_vala.stamp \ - given_name_updates_vala.stamp \ - additional_names_updates_vala.stamp \ - prefix_name_updates_vala.stamp \ - suffix_name_updates_vala.stamp \ - website_updates_vala.stamp \ - favourite_updates_vala.stamp \ - emails_updates_vala.stamp \ - phones_updates_vala.stamp \ - imaddresses_updates_vala.stamp \ - role_details_interface_vala.stamp \ - birthday_details_interface_vala.stamp \ - birthday_updates_vala.stamp \ - note_details_interface_vala.stamp \ - gender_details_interface_vala.stamp \ - postal_address_details_interface_vala.stamp \ - avatar_updates_vala.stamp \ - add_persona_vala.stamp \ - remove_persona_vala.stamp \ - set_nickname_vala.stamp \ - set_favourite_vala.stamp \ - set_phones_vala.stamp \ - set_emails_vala.stamp \ - set_avatar_vala.stamp \ - set_structured_name_vala.stamp \ - set_full_name_vala.stamp \ - set_urls_vala.stamp \ - set_im_addresses_vala.stamp \ - set_postal_addresses_vala.stamp \ - set_roles_vala.stamp \ - set_notes_vala.stamp \ - set_birthday_vala.stamp \ - set_gender_vala.stamp \ - link_personas_vala.stamp \ - duplicated_emails_vala.stamp \ - duplicated_phones_vala.stamp \ - link_personas_via_local_ids_vala.stamp \ - match_im_addresses_vala.stamp \ - match_email_addresses_vala.stamp \ - match_known_emails_vala.stamp \ - match_phone_number_vala.stamp \ - match_name_vala.stamp \ - match_all_vala.stamp \ - set_duplicate_email_vala.stamp \ - set_null_avatar_vala.stamp \ - $(NULL) + *.pid \ + *.address \ + $(NULL) EXTRA_DIST = \ $(MAINTAINERCLEANFILES) \ -- 2.7.4