From 17cdcfb66f7852f46db64304334cbde698e81657 Mon Sep 17 00:00:00 2001 From: Alistair Thomas Date: Sat, 9 Sep 2017 15:04:26 +0100 Subject: [PATCH] build: add built .plugin files to CLEANFILES This enables the files to removed with make clean and to be removed from the list of git untracked files by using git.mk --- plugins/am-project/Makefile.am | 2 ++ plugins/build-basic-autotools/Makefile.am | 3 ++- plugins/class-gen/Makefile.am | 2 ++ plugins/cvs-plugin/Makefile.am | 4 +++- plugins/debug-manager/Makefile.am | 2 ++ plugins/devhelp/Makefile.am | 2 ++ plugins/dir-project/Makefile.am | 2 ++ plugins/document-manager/Makefile.am | 3 ++- plugins/file-loader/Makefile.am | 2 ++ plugins/file-manager/Makefile.am | 3 ++- plugins/file-wizard/Makefile.am | 2 ++ plugins/gdb/Makefile.am | 1 + plugins/git/Makefile.am | 5 +++-- plugins/glade/Makefile.am | 1 + plugins/indentation-c-style/Makefile.am | 3 ++- plugins/indentation-python-style/Makefile.am | 3 ++- plugins/jhbuild/Makefile.am | 2 ++ plugins/js-debugger/Makefile.am | 2 ++ plugins/language-manager/Makefile.am | 1 + plugins/language-support-cpp-java/Makefile.am | 3 ++- plugins/language-support-js/Makefile.am | 4 ++-- plugins/language-support-python/Makefile.am | 3 ++- plugins/language-support-vala/Makefile.am | 3 ++- plugins/message-view/Makefile.am | 3 ++- plugins/mk-project/Makefile.am | 2 ++ plugins/parser-cxx/Makefile.am | 3 ++- plugins/patch/Makefile.am | 2 ++ plugins/project-import/Makefile.am | 2 ++ plugins/project-manager/Makefile.am | 2 ++ plugins/project-wizard/Makefile.am | 3 ++- plugins/project-wizard/templates/Makefile.am | 2 ++ plugins/python-loader/Makefile.am | 3 ++- plugins/quick-open/Makefile.am | 2 ++ plugins/run-program/Makefile.am | 3 ++- plugins/snippets-manager/Makefile.am | 3 ++- plugins/sourceview/Makefile.am | 3 ++- plugins/starter/Makefile.am | 3 ++- plugins/subversion/Makefile.am | 2 ++ plugins/symbol-db/Makefile.am | 3 ++- plugins/terminal/Makefile.am | 5 +++-- plugins/tools/Makefile.am | 5 +++-- 41 files changed, 83 insertions(+), 26 deletions(-) mode change 100755 => 100644 plugins/quick-open/Makefile.am diff --git a/plugins/am-project/Makefile.am b/plugins/am-project/Makefile.am index b67a06071..48a2d2a15 100644 --- a/plugins/am-project/Makefile.am +++ b/plugins/am-project/Makefile.am @@ -115,6 +115,8 @@ EXTRA_DIST = \ ac-parser.h \ am-parser.h +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) + DISTCLEANFILES = \ $(plugin_DATA) diff --git a/plugins/build-basic-autotools/Makefile.am b/plugins/build-basic-autotools/Makefile.am index 085830367..204e2499a 100644 --- a/plugins/build-basic-autotools/Makefile.am +++ b/plugins/build-basic-autotools/Makefile.am @@ -73,6 +73,7 @@ EXTRA_DIST = \ $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/class-gen/Makefile.am b/plugins/class-gen/Makefile.am index 8cff8ecb8..46b2f8617 100644 --- a/plugins/class-gen/Makefile.am +++ b/plugins/class-gen/Makefile.am @@ -55,4 +55,6 @@ libanjuta_class_gen_la_SOURCES= \ EXTRA_DIST = \ $(plugin_in_files) +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) + -include $(top_srcdir)/git.mk diff --git a/plugins/cvs-plugin/Makefile.am b/plugins/cvs-plugin/Makefile.am index dd83f4e57..846e7b96e 100644 --- a/plugins/cvs-plugin/Makefile.am +++ b/plugins/cvs-plugin/Makefile.am @@ -55,6 +55,8 @@ EXTRA_DIST = \ $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) + -include $(top_srcdir)/git.mk diff --git a/plugins/debug-manager/Makefile.am b/plugins/debug-manager/Makefile.am index abe048fea..4e6fd6325 100644 --- a/plugins/debug-manager/Makefile.am +++ b/plugins/debug-manager/Makefile.am @@ -98,6 +98,8 @@ EXTRA_DIST = \ $(gsettings_in_files) \ anjuta-marshal.list +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) + DISTCLEANFILES = \ $(anjuta_plugin_DATA) \ $(gsettings_SCHEMAS) diff --git a/plugins/devhelp/Makefile.am b/plugins/devhelp/Makefile.am index e88255ba2..6c0c84102 100644 --- a/plugins/devhelp/Makefile.am +++ b/plugins/devhelp/Makefile.am @@ -44,4 +44,6 @@ libanjuta_devhelp_la_LIBADD = \ EXTRA_DIST = \ $(plugin_in_files) +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) + -include $(top_srcdir)/git.mk diff --git a/plugins/dir-project/Makefile.am b/plugins/dir-project/Makefile.am index 10d734375..412bb3060 100644 --- a/plugins/dir-project/Makefile.am +++ b/plugins/dir-project/Makefile.am @@ -49,6 +49,8 @@ libdir_project_la_LIBADD = \ EXTRA_DIST = \ $(plugin_in_files) +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) + DISTCLEANFILES = \ $(plugin_DATA) diff --git a/plugins/document-manager/Makefile.am b/plugins/document-manager/Makefile.am index 1a88cdb68..c18fb70b2 100644 --- a/plugins/document-manager/Makefile.am +++ b/plugins/document-manager/Makefile.am @@ -64,6 +64,7 @@ EXTRA_DIST = \ $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/file-loader/Makefile.am b/plugins/file-loader/Makefile.am index 4382c13b4..6c055c000 100644 --- a/plugins/file-loader/Makefile.am +++ b/plugins/file-loader/Makefile.am @@ -47,4 +47,6 @@ libanjuta_loader_la_LIBADD = \ EXTRA_DIST = \ $(plugin_in_files) +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) + -include $(top_srcdir)/git.mk diff --git a/plugins/file-manager/Makefile.am b/plugins/file-manager/Makefile.am index eecb6f527..cf782f977 100644 --- a/plugins/file-manager/Makefile.am +++ b/plugins/file-manager/Makefile.am @@ -87,6 +87,7 @@ EXTRA_DIST = \ $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/file-wizard/Makefile.am b/plugins/file-wizard/Makefile.am index 51eeb74b8..be597ce30 100644 --- a/plugins/file-wizard/Makefile.am +++ b/plugins/file-wizard/Makefile.am @@ -38,4 +38,6 @@ libanjuta_file_wizard_la_SOURCES= \ EXTRA_DIST = \ $(plugin_in_files) +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) + -include $(top_srcdir)/git.mk diff --git a/plugins/gdb/Makefile.am b/plugins/gdb/Makefile.am index 1eefec63d..c63e40f6d 100644 --- a/plugins/gdb/Makefile.am +++ b/plugins/gdb/Makefile.am @@ -63,5 +63,6 @@ EXTRA_DIST = \ SUBDIRS = \ images +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/git/Makefile.am b/plugins/git/Makefile.am index 45ab84c54..0224075b8 100644 --- a/plugins/git/Makefile.am +++ b/plugins/git/Makefile.am @@ -232,7 +232,7 @@ libanjuta_git_la_SOURCES = \ git-apply-mailbox-pane.h \ git-status-factory.c \ git-status-factory.h - + libanjuta_git_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS) @@ -249,6 +249,7 @@ EXTRA_DIST = \ $(plugin_in_files) \ $(gsettings_in_file) -CLEANFILES = $(gsettings_SCHEMAS) +CLEANFILES = $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/glade/Makefile.am b/plugins/glade/Makefile.am index 630d0f5ad..3bee093f9 100644 --- a/plugins/glade/Makefile.am +++ b/plugins/glade/Makefile.am @@ -46,5 +46,6 @@ endif EXTRA_DIST = \ $(plugin_in_files) +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/indentation-c-style/Makefile.am b/plugins/indentation-c-style/Makefile.am index 4ad76e35e..928c6a7cb 100644 --- a/plugins/indentation-c-style/Makefile.am +++ b/plugins/indentation-c-style/Makefile.am @@ -64,6 +64,7 @@ EXTRA_DIST = \ $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/indentation-python-style/Makefile.am b/plugins/indentation-python-style/Makefile.am index 7bcad651c..c8aae72e5 100644 --- a/plugins/indentation-python-style/Makefile.am +++ b/plugins/indentation-python-style/Makefile.am @@ -50,6 +50,7 @@ EXTRA_DIST = \ $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/jhbuild/Makefile.am b/plugins/jhbuild/Makefile.am index bf56211c4..8210e22a6 100644 --- a/plugins/jhbuild/Makefile.am +++ b/plugins/jhbuild/Makefile.am @@ -44,4 +44,6 @@ libanjuta_jhbuild_la_LIBADD = \ EXTRA_DIST = \ $(plugin_in_files) +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) + -include $(top_srcdir)/git.mk diff --git a/plugins/js-debugger/Makefile.am b/plugins/js-debugger/Makefile.am index 169465ae4..6f5cb6cec 100644 --- a/plugins/js-debugger/Makefile.am +++ b/plugins/js-debugger/Makefile.am @@ -47,4 +47,6 @@ libjs_debugger_la_LIBADD = \ EXTRA_DIST = \ $(plugin_in_files) +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) + -include $(top_srcdir)/git.mk diff --git a/plugins/language-manager/Makefile.am b/plugins/language-manager/Makefile.am index 4717db955..02f609cad 100644 --- a/plugins/language-manager/Makefile.am +++ b/plugins/language-manager/Makefile.am @@ -47,5 +47,6 @@ EXTRA_DIST = \ $(plugin_in_files) \ languages.xml +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/language-support-cpp-java/Makefile.am b/plugins/language-support-cpp-java/Makefile.am index 597789613..46c4b1cea 100644 --- a/plugins/language-support-cpp-java/Makefile.am +++ b/plugins/language-support-cpp-java/Makefile.am @@ -66,6 +66,7 @@ EXTRA_DIST = \ $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/language-support-js/Makefile.am b/plugins/language-support-js/Makefile.am index 99c8641e6..521e24ccc 100644 --- a/plugins/language-support-js/Makefile.am +++ b/plugins/language-support-js/Makefile.am @@ -75,7 +75,7 @@ EXTRA_DIST = \ $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk - diff --git a/plugins/language-support-python/Makefile.am b/plugins/language-support-python/Makefile.am index 4a048dc79..44dd40d94 100644 --- a/plugins/language-support-python/Makefile.am +++ b/plugins/language-support-python/Makefile.am @@ -52,6 +52,7 @@ EXTRA_DIST = \ $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/language-support-vala/Makefile.am b/plugins/language-support-vala/Makefile.am index f19f12916..616329741 100644 --- a/plugins/language-support-vala/Makefile.am +++ b/plugins/language-support-vala/Makefile.am @@ -80,7 +80,8 @@ EXTRA_DIST = \ libanjuta-3.0.vapi CLEANFILES += \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/message-view/Makefile.am b/plugins/message-view/Makefile.am index 703554cdb..a53d906f6 100644 --- a/plugins/message-view/Makefile.am +++ b/plugins/message-view/Makefile.am @@ -52,6 +52,7 @@ EXTRA_DIST = \ $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/mk-project/Makefile.am b/plugins/mk-project/Makefile.am index 4741ae694..4ccb048e9 100644 --- a/plugins/mk-project/Makefile.am +++ b/plugins/mk-project/Makefile.am @@ -65,6 +65,8 @@ EXTRA_DIST = \ $(plugin_in_files) \ mk-parser.h +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) + DISTCLEANFILES = \ $(plugin_DATA) diff --git a/plugins/parser-cxx/Makefile.am b/plugins/parser-cxx/Makefile.am index 73ca6b76a..cf5785fab 100644 --- a/plugins/parser-cxx/Makefile.am +++ b/plugins/parser-cxx/Makefile.am @@ -65,6 +65,7 @@ EXTRA_DIST = \ $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/patch/Makefile.am b/plugins/patch/Makefile.am index fce23c233..eb677f12a 100644 --- a/plugins/patch/Makefile.am +++ b/plugins/patch/Makefile.am @@ -48,4 +48,6 @@ libanjuta_patch_la_LIBADD = \ EXTRA_DIST = \ $(plugin_in_files) +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) + -include $(top_srcdir)/git.mk diff --git a/plugins/project-import/Makefile.am b/plugins/project-import/Makefile.am index 7b46d5523..53bd1a607 100644 --- a/plugins/project-import/Makefile.am +++ b/plugins/project-import/Makefile.am @@ -40,4 +40,6 @@ libanjuta_project_import_la_SOURCES= \ EXTRA_DIST = \ $(plugin_in_files) +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) + -include $(top_srcdir)/git.mk diff --git a/plugins/project-manager/Makefile.am b/plugins/project-manager/Makefile.am index 841abe57c..25fea50ee 100644 --- a/plugins/project-manager/Makefile.am +++ b/plugins/project-manager/Makefile.am @@ -81,6 +81,8 @@ EXTRA_DIST = \ $(plugin_in_files) \ project-marshal.list +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) + DISTCLEANFILES = \ $(project_plugin_DATA) \ $(project_in_files) diff --git a/plugins/project-wizard/Makefile.am b/plugins/project-wizard/Makefile.am index f7d6b657a..13c3fe74b 100644 --- a/plugins/project-wizard/Makefile.am +++ b/plugins/project-wizard/Makefile.am @@ -70,6 +70,7 @@ EXTRA_DIST = \ $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/project-wizard/templates/Makefile.am b/plugins/project-wizard/templates/Makefile.am index 901765b05..af5e8a221 100644 --- a/plugins/project-wizard/templates/Makefile.am +++ b/plugins/project-wizard/templates/Makefile.am @@ -58,6 +58,8 @@ dist_wizard_files_DATA = \ rm $@_ +CLEANFILES = $(template_in_files:.in=) + EXTRA_DIST = $(template_in_files) -include $(top_srcdir)/git.mk diff --git a/plugins/python-loader/Makefile.am b/plugins/python-loader/Makefile.am index c92c70c99..64b63bdad 100644 --- a/plugins/python-loader/Makefile.am +++ b/plugins/python-loader/Makefile.am @@ -51,5 +51,6 @@ endif # HAVE_PYTHON EXTRA_DIST = \ $(plugin_in_files) --include $(top_srcdir)/git.mk +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) +-include $(top_srcdir)/git.mk diff --git a/plugins/quick-open/Makefile.am b/plugins/quick-open/Makefile.am old mode 100755 new mode 100644 index 1612ab385..821973296 --- a/plugins/quick-open/Makefile.am +++ b/plugins/quick-open/Makefile.am @@ -40,4 +40,6 @@ EXTRA_DIST = \ $(plugin_in_files) \ $(schema_in_files) +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) + -include $(top_srcdir)/git.mk diff --git a/plugins/run-program/Makefile.am b/plugins/run-program/Makefile.am index 35ed2c5f4..41a721d9d 100644 --- a/plugins/run-program/Makefile.am +++ b/plugins/run-program/Makefile.am @@ -51,6 +51,7 @@ EXTRA_DIST = \ $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/snippets-manager/Makefile.am b/plugins/snippets-manager/Makefile.am index 95d83d3cd..66fc415b1 100644 --- a/plugins/snippets-manager/Makefile.am +++ b/plugins/snippets-manager/Makefile.am @@ -82,6 +82,7 @@ EXTRA_DIST = \ $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/sourceview/Makefile.am b/plugins/sourceview/Makefile.am index 247595d28..be73e73e5 100644 --- a/plugins/sourceview/Makefile.am +++ b/plugins/sourceview/Makefile.am @@ -92,6 +92,7 @@ EXTRA_DIST = \ $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/starter/Makefile.am b/plugins/starter/Makefile.am index 8cd6295c3..ec93ee0d6 100644 --- a/plugins/starter/Makefile.am +++ b/plugins/starter/Makefile.am @@ -43,7 +43,8 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml) CLEANFILES = \ $(BUILT_SOURCES) \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) EXTRA_DIST = \ $(plugin_in_files) \ diff --git a/plugins/subversion/Makefile.am b/plugins/subversion/Makefile.am index c12b2f148..7a0e9c25c 100644 --- a/plugins/subversion/Makefile.am +++ b/plugins/subversion/Makefile.am @@ -105,4 +105,6 @@ endif EXTRA_DIST = \ $(plugin_in_files) +CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) + -include $(top_srcdir)/git.mk diff --git a/plugins/symbol-db/Makefile.am b/plugins/symbol-db/Makefile.am index caadd4ee7..0fc787caa 100644 --- a/plugins/symbol-db/Makefile.am +++ b/plugins/symbol-db/Makefile.am @@ -124,6 +124,7 @@ EXTRA_DIST = \ $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/terminal/Makefile.am b/plugins/terminal/Makefile.am index eddb86092..64b75da4e 100644 --- a/plugins/terminal/Makefile.am +++ b/plugins/terminal/Makefile.am @@ -53,9 +53,10 @@ endif EXTRA_DIST = \ $(plugin_in_files) \ - $(gsettings_in_file) + $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + CLEANFILES = $(plugin_in_files:.plugin.in=.plugin) -include $(top_srcdir)/git.mk diff --git a/plugins/tools/Makefile.am b/plugins/tools/Makefile.am index a78f5b484..904400b5a 100644 --- a/plugins/tools/Makefile.am +++ b/plugins/tools/Makefile.am @@ -56,10 +56,11 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml) EXTRA_DIST = \ $(plugin_in_files) \ - $(gsettings_in_file) + $(gsettings_in_file) CLEANFILES = \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(plugin_in_files:.plugin.in=.plugin) SUBDIRS = \ scripts -- 2.11.4.GIT