Branch: refs/heads/master Author: Quentin Glidic sardemff7+git@sardemff7.net Committer: Chow Loong Jin hyperair@debian.org Date: Sat, 16 Jun 2012 16:23:06 Commit: 94cb8541d4a184205a58619aa82e0196a716d4d3 https://github.com/geany/geany-plugins/commit/94cb8541d4a184205a58619aa82e01...
Log Message: ----------- Autotools: Avoid most EXTRA_DIST
Using dist_ prefix for the plugin doc and data files allows us to remove some unneeded EXTRA_DIST
Modified Paths: -------------- build/vars.auxfiles.mk build/vars.docs.mk debugger/Makefile.am debugger/img/Makefile.am devhelp/data/Makefile.am geanygendoc/Makefile.am geanygendoc/data/filetypes/Makefile.am geanygendoc/docs/Makefile.am geanylatex/doc/Makefile.am geanylua/Makefile.am geanylua/docs/Makefile.am geanylua/examples/dialogs/Makefile.am geanylua/examples/edit/Makefile.am geanylua/examples/info/Makefile.am geanylua/examples/scripting/Makefile.am geanylua/examples/work/Makefile.am gproject/icons/Makefile.am multiterm/Makefile.am spellcheck/Makefile.am treebrowser/Makefile.am webhelper/Makefile.am
Modified: build/vars.auxfiles.mk 9 files changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,13 @@ include $(top_srcdir)/build/vars.docs.mk
-plugindoc_DATA = $(AUXFILES) +dist_plugindoc_DATA = \ + README \ + ChangeLog \ + NEWS \ + COPYING \ + AUTHORS \ + $(AUXFILES) + EXTRA_DIST = \ wscript_build \ wscript_configure
Modified: build/vars.docs.mk 7 files changed, 0 insertions(+), 7 deletions(-) =================================================================== @@ -3,10 +3,3 @@ htmldocdir = $(plugindocdir) plugindatadir = $(pkgdatadir)/$(plugin) pluginlibdir = $(pkglibdir)/$(plugin) examplesdir = $(plugindatadir) -AUXFILES = \ - README \ - ChangeLog \ - NEWS \ - COPYING \ - AUTHORS -
Modified: debugger/Makefile.am 1 files changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,6 @@ if ENABLE_DEBUGGER include $(top_srcdir)/build/vars.auxfiles.mk else include $(top_srcdir)/build/vars.docs.mk -EXTRA_DIST = endif
SUBDIRS = src img
Modified: debugger/img/Makefile.am 11 files changed, 3 insertions(+), 8 deletions(-) =================================================================== @@ -1,7 +1,9 @@ include $(top_srcdir)/build/vars.docs.mk
plugin = debugger -FILES = \ + +if ENABLE_DEBUGGER +dist_plugindata_DATA = \ continue.png \ restart.gif \ run.gif \ @@ -11,11 +13,4 @@ FILES = \ step_over.gif \ stop.gif \ tabs.gif - -EXTRA_DIST = $(FILES) - -if ENABLE_DEBUGGER -plugindata_DATA = $(FILES) -else -EXTRA_DATA = $(FILES) endif
Modified: devhelp/data/Makefile.am 10 files changed, 3 insertions(+), 7 deletions(-) =================================================================== @@ -1,17 +1,13 @@ +if ENABLE_DEVHELP include $(top_srcdir)/build/vars.docs.mk
plugin = devhelp -FILES = \ + +dist_plugindata_DATA = \ devhelp-plugin.svg \ devhelp-plugin-48.png \ geany-devhelp-plugin.png \ home.html \ devhelp.conf
-EXTRA_DIST = $(FILES) - -if ENABLE_DEVHELP -plugindata_DATA = $(FILES) -else -EXTRA_DATA = $(FILES) endif
Modified: geanygendoc/Makefile.am 1 files changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,6 @@ if ENABLE_GEANYGENDOC include $(top_srcdir)/build/vars.auxfiles.mk else include $(top_srcdir)/build/vars.docs.mk -EXTRA_DIST = $(AUXFILES) endif
SUBDIRS = src docs data
Modified: geanygendoc/data/filetypes/Makefile.am 16 files changed, 6 insertions(+), 10 deletions(-) =================================================================== @@ -1,15 +1,11 @@ if ENABLE_GEANYGENDOC +include $(top_srcdir)/build/vars.docs.mk + plugin = geanygendoc -# FIXME: should probably done by an included .mk such as vars.data.mk -plugindatadir = $(pkgdatadir)/$(plugin) -endif +filetypesdir = $(plugindatadir)/filetypes
-FILETYPES = c.conf \ - vala.conf +dist_filetypes_DATA = \ + c.conf \ + vala.conf
-if ENABLE_GEANYGENDOC -filetypesdir = $(plugindatadir)/filetypes -filetypes_DATA = $(FILETYPES) endif - -EXTRA_DIST = $(FILETYPES)
Modified: geanygendoc/docs/Makefile.am 17 files changed, 9 insertions(+), 8 deletions(-) =================================================================== @@ -2,19 +2,20 @@ if ENABLE_GEANYGENDOC include $(top_srcdir)/build/vars.docs.mk plugin = geanygendoc pluginhtmldocdir = $(plugindocdir)/html -endif ENABLE_GEANYGENDOC
-EXTRA_DIST = manual.rst \ - manual.css \ - html4css1.css \ - manual.html +EXTRA_DIST = \ + manual.css \ + html4css1.css
-if ENABLE_GEANYGENDOC -plugindoc_DATA = manual.rst -pluginhtmldoc_DATA = manual.html +dist_plugindoc_DATA = \ + manual.rst + +dist_pluginhtmldoc_DATA = \ + manual.html
if BUILD_RST manual.html: manual.rst manual.css $(AM_V_GEN) $(RST2HTML) -d --strict --stylesheet-path manual.css $< $@ endif BUILD_RST + endif ENABLE_GEANYGENDOC
Modified: geanylatex/doc/Makefile.am 7 files changed, 2 insertions(+), 5 deletions(-) =================================================================== @@ -1,6 +1,7 @@ +if ENABLE_GEANYLATEX include $(top_srcdir)/build/vars.docs.mk
-docfiles = \ +dist_plugindoc_DATA = \ geanylatex2.html \ geanylatex3.html \ geanylatex4.html \ @@ -17,8 +18,4 @@ docfiles = \ img/plugin_manager.png \ img/toolbar.png
-EXTRA_DIST = $(docfiles) - -if ENABLE_GEANYLATEX -plugindoc_DATA = $(docfiles) endif
Modified: geanylua/Makefile.am 3 files changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -4,9 +4,8 @@ include $(top_srcdir)/build/vars.auxfiles.mk plugin = geanylua else include $(top_srcdir)/build/vars.docs.mk -EXTRA_DIST = $(AUXFILES) endif -EXTRA_DIST += util +EXTRA_DIST = util include $(top_srcdir)/build/vars.build.mk
Modified: geanylua/docs/Makefile.am 10 files changed, 1 insertions(+), 9 deletions(-) =================================================================== @@ -1,12 +1,9 @@ -# don't include if geanylua's disabled, otherwise a whole bunch of empty -# directories will be created if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.docs.mk -endif
plugin = geanylua
-DOCFILES = \ +dist_htmldoc_DATA = \ geanylua-index.html \ geanylua-input.html \ geanylua-intro.html \ @@ -15,9 +12,4 @@ DOCFILES = \ geanylua-ref.html \ luarefv51.html
-if ENABLE_GEANYLUA -htmldoc_DATA = $(DOCFILES) endif - -# make sure that these files are distributed as well -EXTRA_DIST = $(DOCFILES)
Modified: geanylua/examples/dialogs/Makefile.am 10 files changed, 2 insertions(+), 8 deletions(-) =================================================================== @@ -1,17 +1,11 @@ -# avoid creating empty directories if disabled if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.docs.mk + plugin = geanylua dialogsdir = $(examplesdir)/dialogs -endif
-EXAMPLES = \ +dist_dialogs_DATA = \ basic-dialogs.lua \ complex-dialog.lua
-if ENABLE_GEANYLUA -dialogs_DATA = $(EXAMPLES) endif - -# make sure that these files are distributed as well -EXTRA_DIST = $(EXAMPLES)
Modified: geanylua/examples/edit/Makefile.am 10 files changed, 2 insertions(+), 8 deletions(-) =================================================================== @@ -1,11 +1,10 @@ -# avoid creating empty directories if disabled if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.docs.mk + plugin = geanylua editdir = $(examplesdir)/edit -endif
-EXAMPLES = \ +dist_edit_DATA = \ calculator.lua \ lua-replace.lua \ proper-case.lua \ @@ -13,9 +12,4 @@ EXAMPLES = \ right-trim.lua \ select-block.lua
-if ENABLE_GEANYLUA -edit_DATA = $(EXAMPLES) endif - -# make sure that these files are distributed as well -EXTRA_DIST = $(EXAMPLES)
Modified: geanylua/examples/info/Makefile.am 10 files changed, 2 insertions(+), 8 deletions(-) =================================================================== @@ -1,20 +1,14 @@ -# avoid creating empty directories if disabled if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.docs.mk + plugin = geanylua exampleinfodir = $(examplesdir)/info -endif
-EXAMPLES = \ +dist_exampleinfo_DATA = \ about.lua \ app-information.lua \ file-information.lua \ list-open-files.lua \ show-filename.lua
-if ENABLE_GEANYLUA -exampleinfo_DATA = $(EXAMPLES) endif - -# make sure that these files are distributed as well -EXTRA_DIST = $(EXAMPLES)
Modified: geanylua/examples/scripting/Makefile.am 10 files changed, 2 insertions(+), 8 deletions(-) =================================================================== @@ -1,19 +1,13 @@ -# avoid creating empty directories if disabled if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.docs.mk + plugin = geanylua scriptingdir = $(examplesdir)/scripting -endif
-EXAMPLES = \ +dist_scripting_DATA = \ help.lua \ open-script.lua \ rebuild-menu.lua \ show-examples.lua
-if ENABLE_GEANYLUA -scripting_DATA = $(EXAMPLES) endif - -# make sure that these files are distributed as well -EXTRA_DIST = $(EXAMPLES)
Modified: geanylua/examples/work/Makefile.am 10 files changed, 2 insertions(+), 8 deletions(-) =================================================================== @@ -1,18 +1,12 @@ -# avoid creating empty directories if disabled if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.docs.mk + plugin = geanylua workdir = $(examplesdir)/work -endif
-EXAMPLES = \ +dist_work_DATA = \ 01.edit-test-script.lua \ 02.run-test-script.lua \ 03.install-test-script.lua
-if ENABLE_GEANYLUA -work_DATA = $(EXAMPLES) endif - -# make sure that these files are distributed as well -EXTRA_DIST = $(EXAMPLES)
Modified: gproject/icons/Makefile.am 9 files changed, 2 insertions(+), 7 deletions(-) =================================================================== @@ -1,6 +1,7 @@ +if ENABLE_GPROJECT icondir = $(datadir)/icons/hicolor/16x16/apps
-ICONS = \ +dist_icon_DATA = \ gproject-file.png \ gproject-header.png \ gproject-source.png \ @@ -9,8 +10,6 @@ ICONS = \ gproject-follow.png \ gproject-refresh.png
-EXTRA_DIST = $(ICONS) - gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor install-data-hook: update-icon-cache uninstall-hook: update-icon-cache @@ -23,8 +22,4 @@ update-icon-cache: echo "*** $(gtk_update_icon_cache)"; \ fi
-if ENABLE_GPROJECT -icon_DATA = $(ICONS) -else -EXTRA_DATA = $(ICONS) endif
Modified: multiterm/Makefile.am 3 files changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -2,10 +2,9 @@ if ENABLE_MULTITERM include $(top_srcdir)/build/vars.auxfiles.mk else include $(top_srcdir)/build/vars.docs.mk -EXTRA_DIST = $(AUXFILES) endif
-AUXFILES += TODO +AUXFILES = TODO
SUBDIRS = src plugin = multiterm
Modified: spellcheck/Makefile.am 1 files changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,6 @@ if ENABLE_SPELLCHECK include $(top_srcdir)/build/vars.auxfiles.mk else include $(top_srcdir)/build/vars.docs.mk -EXTRA_DIST = $(AUXFILES) endif
SUBDIRS = src
Modified: treebrowser/Makefile.am 1 files changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,6 @@ if ENABLE_TREEBROWSER include $(top_srcdir)/build/vars.auxfiles.mk else include $(top_srcdir)/build/vars.docs.mk -EXTRA_DIST = $(AUXFILES) endif
SUBDIRS = src
Modified: webhelper/Makefile.am 3 files changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -2,10 +2,9 @@ if ENABLE_WEBHELPER include $(top_srcdir)/build/vars.auxfiles.mk else include $(top_srcdir)/build/vars.docs.mk -EXTRA_DIST = $(AUXFILES) endif
-AUXFILES += TODO +AUXFILES = TODO
SUBDIRS = src plugin = webhelper
@@ Diff output truncated at 100000 characters. @@
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).