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:07 Commit: f3acbb15d373ca24c07a8b3d51cd63f802aa8455 https://github.com/geany/geany-plugins/commit/f3acbb15d373ca24c07a8b3d51cd63...

Log Message: ----------- Autotools: Conditionally add plugins to SUBDIRS

Automake will automatically generate a DIST_SUBDIRS variable to get everything right for "make dist"

Modified Paths: -------------- Makefile.am addons/Makefile.am addons/src/Makefile.am codenav/Makefile.am codenav/src/Makefile.am debugger/Makefile.am debugger/img/Makefile.am debugger/src/Makefile.am devhelp/Makefile.am devhelp/data/Makefile.am devhelp/devhelp/Makefile.am devhelp/src/Makefile.am geanydoc/Makefile.am geanydoc/src/Makefile.am geanyextrasel/Makefile.am geanyextrasel/src/Makefile.am geanygdb/Makefile.am geanygdb/src/Makefile.am geanygendoc/Makefile.am geanygendoc/data/filetypes/Makefile.am geanygendoc/docs/Makefile.am geanygendoc/src/Makefile.am geanyinsertnum/Makefile.am geanyinsertnum/src/Makefile.am geanylatex/Makefile.am geanylatex/doc/Makefile.am geanylatex/src/Makefile.am geanylipsum/Makefile.am geanylipsum/src/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 geanymacro/Makefile.am geanymacro/src/Makefile.am geanyminiscript/Makefile.am geanyminiscript/src/Makefile.am geanynumberedbookmarks/Makefile.am geanynumberedbookmarks/src/Makefile.am geanypg/Makefile.am geanypg/src/Makefile.am geanyprj/Makefile.am geanyprj/src/Makefile.am geanysendmail/Makefile.am geanysendmail/src/Makefile.am geanyvc/Makefile.am geanyvc/src/Makefile.am geanyvc/tests/Makefile.am geniuspaste/Makefile.am geniuspaste/src/Makefile.am gproject/Makefile.am gproject/icons/Makefile.am gproject/src/Makefile.am multiterm/Makefile.am multiterm/src/Makefile.am pretty-printer/src/Makefile.am shiftcolumn/Makefile.am shiftcolumn/src/Makefile.am spellcheck/Makefile.am spellcheck/src/Makefile.am tableconvert/Makefile.am tableconvert/src/Makefile.am treebrowser/Makefile.am treebrowser/src/Makefile.am updatechecker/Makefile.am updatechecker/src/Makefile.am webhelper/Makefile.am webhelper/src/Makefile.am xmlsnippets/Makefile.am xmlsnippets/src/Makefile.am

Modified: Makefile.am 152 files changed, 118 insertions(+), 34 deletions(-) =================================================================== @@ -1,39 +1,123 @@ -plugins = \ - addons \ - codenav \ - debugger \ - devhelp \ - geanydoc \ - geanyextrasel \ - geanygdb \ - geanygendoc \ - geanyinsertnum \ - geanylatex \ - geanylipsum \ - geanylua \ - geanymacro \ - geanyminiscript \ - geanynumberedbookmarks \ - geanypg \ - geanyprj \ - geanysendmail \ - geanyvc \ - gproject \ - multiterm \ - pretty-printer \ - shiftcolumn \ - spellcheck \ - tableconvert \ - treebrowser \ - updatechecker \ - webhelper \ - xmlsnippets - ACLOCAL_AMFLAGS = -I build/cache -I build -I build/bundled --install

-SUBDIRS = \ - po \ - $(plugins) +SUBDIRS = po + +if ENABLE_ADDONS +SUBDIRS += addons +endif + +if ENABLE_CODENAV +SUBDIRS += codenav +endif + +if ENABLE_DEBUGGER +SUBDIRS += debugger +endif + +if ENABLE_DEVHELP +SUBDIRS += devhelp +endif + +if ENABLE_GEANYDOC +SUBDIRS += geanydoc +endif + +if ENABLE_GEANYEXTRASEL +SUBDIRS += geanyextrasel +endif + +if ENABLE_GEANYGDB +SUBDIRS += geanygdb +endif + +if ENABLE_GEANYGENDOC +SUBDIRS += geanygendoc +endif + +if ENABLE_GEANYINSERTNUM +SUBDIRS += geanyinsertnum +endif + +if ENABLE_GEANYLATEX +SUBDIRS += geanylatex +endif + +if ENABLE_GEANYLIPSUM +SUBDIRS += geanylipsum +endif + +if ENABLE_GEANYLUA +SUBDIRS += geanylua +endif + +if ENABLE_GEANYMACRO +SUBDIRS += geanymacro +endif + +if ENABLE_GEANYMINISCRIPT +SUBDIRS += geanyminiscript +endif + +if ENABLE_GEANYNUMBEREDBOOKMARKS +SUBDIRS += geanynumberedbookmarks +endif + +if ENABLE_GEANYPG +SUBDIRS += geanypg +endif + +if ENABLE_GEANYPRJ +SUBDIRS += geanyprj +endif + +if ENABLE_GEANYSENDMAIL +SUBDIRS += geanysendmail +endif + +if ENABLE_GEANYVC +SUBDIRS += geanyvc +endif + +if ENABLE_GPROJECT +SUBDIRS += gproject +endif + +if ENABLE_MULTITERM +SUBDIRS += multiterm +endif + +if ENABLE_PRETTY_PRINTER +SUBDIRS += pretty-printer +endif + +if ENABLE_SHIFTCOLUMN +SUBDIRS += shiftcolumn +endif + +if ENABLE_SPELLCHECK +SUBDIRS += spellcheck +endif + +if ENABLE_TABLECONVERT +SUBDIRS += tableconvert +endif + +if ENABLE_TREEBROWSER +SUBDIRS += treebrowser +endif + +if ENABLE_UPDATECHECKER +SUBDIRS += updatechecker +endif + +if ENABLE_WEBHELPER +SUBDIRS += webhelper +endif + +if ENABLE_XMLSNIPPETS +SUBDIRS += xmlsnippets +endif +

EXTRA_DIST = \ build/__init__.py \

Modified: addons/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_ADDONS include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src plugin = addons

Modified: addons/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_ADDONS geanyplugins_LTLIBRARIES = addons.la -endif

addons_la_SOURCES = \ addons.h \

Modified: codenav/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_CODENAV include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src plugin = codenav

Modified: codenav/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_CODENAV geanyplugins_LTLIBRARIES = codenav.la -endif

codenav_la_SOURCES = \ codenavigation.c \

Modified: debugger/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_DEBUGGER include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src img plugin = debugger

Modified: debugger/img/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -2,7 +2,6 @@ include $(top_srcdir)/build/vars.docs.mk

plugin = debugger

-if ENABLE_DEBUGGER dist_plugindata_DATA = \ continue.png \ restart.gif \ @@ -13,4 +12,3 @@ dist_plugindata_DATA = \ step_over.gif \ stop.gif \ tabs.gif -endif

Modified: debugger/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,9 +1,7 @@ include $(top_srcdir)/build/vars.build.mk include $(top_srcdir)/build/vars.docs.mk

-if ENABLE_DEBUGGER geanyplugins_LTLIBRARIES = debugger.la -endif

plugin = debugger

Modified: devhelp/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_DEVHELP include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = devhelp src data plugin = devhelp

Modified: devhelp/data/Makefile.am 3 files changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -1,4 +1,3 @@ -if ENABLE_DEVHELP include $(top_srcdir)/build/vars.docs.mk

plugin = devhelp @@ -9,5 +8,3 @@ dist_plugindata_DATA = \ geany-devhelp-plugin.png \ home.html \ devhelp.conf - -endif

Modified: devhelp/devhelp/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_DEVHELP noinst_LTLIBRARIES = libdevhelp-2.la -endif

dh_headers = \ dh-assistant.h \

Modified: devhelp/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -2,9 +2,7 @@ include $(top_srcdir)/build/vars.build.mk

plugin = devhelp

-if ENABLE_DEVHELP geanyplugins_LTLIBRARIES = devhelp.la -endif

devhelp_la_SOURCES = \ dhp-manpages.c \

Modified: geanydoc/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_GEANYDOC include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src tests plugin = geanydoc

Modified: geanydoc/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_GEANYDOC geanyplugins_LTLIBRARIES = geanydoc.la -endif

geanydoc_la_SOURCES = \ config.c \

Modified: geanyextrasel/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_GEANYEXTRASEL include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src plugin = geanyextrasel

Modified: geanyextrasel/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_GEANYEXTRASEL geanyplugins_LTLIBRARIES = geanyextrasel.la -endif

geanyextrasel_la_SOURCES = extrasel.c geanyextrasel_la_LIBADD = $(COMMONLIBS)

Modified: geanygdb/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_GEANYGDB include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src tests plugin = geanygdb

Modified: geanygdb/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,10 +1,8 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_GEANYGDB geanygdbdir = $(libexecdir)/geany-plugins/geanygdb geanyplugins_LTLIBRARIES = geanygdb.la geanygdb_PROGRAMS = ttyhelper -endif

geanygdb_la_SOURCES = \ gdb-io.h \

Modified: geanygendoc/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_GEANYGENDOC include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src docs data plugin = geanygendoc

Modified: geanygendoc/data/filetypes/Makefile.am 3 files changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -1,4 +1,3 @@ -if ENABLE_GEANYGENDOC include $(top_srcdir)/build/vars.docs.mk

plugin = geanygendoc @@ -7,5 +6,3 @@ filetypesdir = $(plugindatadir)/filetypes dist_filetypes_DATA = \ c.conf \ vala.conf - -endif

Modified: geanygendoc/docs/Makefile.am 3 files changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -1,4 +1,3 @@ -if ENABLE_GEANYGENDOC include $(top_srcdir)/build/vars.docs.mk plugin = geanygendoc pluginhtmldocdir = $(plugindocdir)/html @@ -17,5 +16,3 @@ 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: geanygendoc/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,9 +1,7 @@ include $(top_srcdir)/build/vars.build.mk plugin = geanygendoc

-if ENABLE_GEANYGENDOC geanyplugins_LTLIBRARIES = geanygendoc.la -endif

geanygendoc_la_SOURCES = \ ggd.c \

Modified: geanyinsertnum/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_GEANYINSERTNUM include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src plugin = geanyinsertnum

Modified: geanyinsertnum/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_GEANYINSERTNUM geanyplugins_LTLIBRARIES = geanyinsertnum.la -endif

geanyinsertnum_la_SOURCES = insertnum.c geanyinsertnum_la_LIBADD = $(COMMONLIBS)

Modified: geanylatex/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_GEANYLATEX include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src doc plugin = geanylatex

Modified: geanylatex/doc/Makefile.am 3 files changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -1,4 +1,3 @@ -if ENABLE_GEANYLATEX include $(top_srcdir)/build/vars.docs.mk

dist_plugindoc_DATA = \ @@ -17,5 +16,3 @@ dist_plugindoc_DATA = \ img/latexwizard.png \ img/plugin_manager.png \ img/toolbar.png - -endif

Modified: geanylatex/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_GEANYLATEX geanyplugins_LTLIBRARIES = geanylatex.la -endif

geanylatex_la_SOURCES = \ bibtex.c \

Modified: geanylipsum/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_GEANYLIPSUM include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src plugin = geanylipsum

Modified: geanylipsum/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_GEANYLIPSUM geanyplugins_LTLIBRARIES = geanylipsum.la -endif

geanylipsum_la_SOURCES = geanylipsum.c geanylipsum_la_LIBADD = $(COMMONLIBS)

Modified: geanylua/Makefile.am 6 files changed, 0 insertions(+), 6 deletions(-) =================================================================== @@ -1,19 +1,13 @@ -# don't install docs if disabled -if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.build.mk include $(top_srcdir)/build/vars.auxfiles.mk

plugin = geanylua -endif

EXTRA_DIST = util

-# don't build if disabled -if ENABLE_GEANYLUA geanyplugins_LTLIBRARIES = geanylua.la geanyluadir = $(pkglibdir)/geanylua geanylua_LTLIBRARIES = libgeanylua.la -endif

geanylua_la_SOURCES = geanylua.c libgeanylua_la_SOURCES = \

Modified: geanylua/docs/Makefile.am 3 files changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -1,4 +1,3 @@ -if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.docs.mk

plugin = geanylua @@ -11,5 +10,3 @@ dist_htmldoc_DATA = \ geanylua-keys.html \ geanylua-ref.html \ luarefv51.html - -endif

Modified: geanylua/examples/dialogs/Makefile.am 3 files changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -1,4 +1,3 @@ -if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.docs.mk

plugin = geanylua @@ -7,5 +6,3 @@ dialogsdir = $(examplesdir)/dialogs dist_dialogs_DATA = \ basic-dialogs.lua \ complex-dialog.lua - -endif

Modified: geanylua/examples/edit/Makefile.am 3 files changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -1,4 +1,3 @@ -if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.docs.mk

plugin = geanylua @@ -11,5 +10,3 @@ dist_edit_DATA = \ reverse.lua \ right-trim.lua \ select-block.lua - -endif

Modified: geanylua/examples/info/Makefile.am 3 files changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -1,4 +1,3 @@ -if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.docs.mk

plugin = geanylua @@ -10,5 +9,3 @@ dist_exampleinfo_DATA = \ file-information.lua \ list-open-files.lua \ show-filename.lua - -endif

Modified: geanylua/examples/scripting/Makefile.am 3 files changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -1,4 +1,3 @@ -if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.docs.mk

plugin = geanylua @@ -9,5 +8,3 @@ dist_scripting_DATA = \ open-script.lua \ rebuild-menu.lua \ show-examples.lua - -endif

Modified: geanylua/examples/work/Makefile.am 3 files changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -1,4 +1,3 @@ -if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.docs.mk

plugin = geanylua @@ -8,5 +7,3 @@ dist_work_DATA = \ 01.edit-test-script.lua \ 02.run-test-script.lua \ 03.install-test-script.lua - -endif

Modified: geanymacro/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_GEANYMACRO include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src plugin = geanymacro

Modified: geanymacro/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_GEANYMACRO geanyplugins_LTLIBRARIES = geanymacro.la -endif

geanymacro_la_SOURCES = geanymacro.c geanymacro_la_LIBADD = $(COMMONLIBS)

Modified: geanyminiscript/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_GEANYMINISCRIPT include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src plugin = geanyminiscript

Modified: geanyminiscript/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_GEANYMINISCRIPT geanyplugins_LTLIBRARIES = geanyminiscript.la -endif

geanyminiscript_la_SOURCES = gms.c gms.h gms_gui.c gms_gui.h gms_debug.h geanyminiscript_la_LIBADD = $(COMMONLIBS)

Modified: geanynumberedbookmarks/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_GEANYNUMBEREDBOOKMARKS include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src plugin = geanynumberedbookmarks

Modified: geanynumberedbookmarks/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_GEANYNUMBEREDBOOKMARKS geanyplugins_LTLIBRARIES = geanynumberedbookmarks.la -endif

geanynumberedbookmarks_la_SOURCES = geanynumberedbookmarks.c geanynumberedbookmarks_la_LIBADD = $(COMMONLIBS)

Modified: geanypg/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_GEANYPG include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src plugin = geanypg

Modified: geanypg/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_GEANYPG geanyplugins_LTLIBRARIES = geanypg.la -endif

geanypg_la_SOURCES = \ helper_functions.c \

Modified: geanyprj/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_GEANYPRJ include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src tests plugin = geanyprj

Modified: geanyprj/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_GEANYPRJ geanyplugins_LTLIBRARIES = geanyprj.la -endif

geanyprj_la_SOURCES = geanyprj.c \ geanyprj.h \

Modified: geanysendmail/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_GEANYSENDMAIL include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src plugin = geanysendmail

Modified: geanysendmail/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_GEANYSENDMAIL geanyplugins_LTLIBRARIES = geanysendmail.la -endif

geanysendmail_la_SOURCES = geanysendmail.c icon.h geanysendmail_la_LIBADD = $(COMMONLIBS)

Modified: geanyvc/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_GEANYVC include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src tests plugin = geanyvc

Modified: geanyvc/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_GEANYVC geanyplugins_LTLIBRARIES = geanyvc.la -endif

geanyvc_la_SOURCES = \ externdiff.c \

Modified: geanyvc/tests/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,5 +1,4 @@ if UNITTESTS -if ENABLE_GEANYVC include $(top_srcdir)/build/vars.build.mk INCLUDES = $(GEANY_CFLAGS) -DUNITTESTS TESTS=unittests @@ -7,4 +6,3 @@ check_PROGRAMS=unittests unittests_SOURCES = unittests.c ../src/utils.c unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ endif -endif

Modified: geniuspaste/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_GENIUSPASTE include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src plugin = geniuspaste

Modified: geniuspaste/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,9 +1,7 @@ include $(top_srcdir)/build/vars.build.mk plugin = geniuspaste

-if ENABLE_GENIUSPASTE geanyplugins_LTLIBRARIES = geniuspaste.la -endif

geniuspaste_la_SOURCES = geniuspaste.c geniuspaste_la_CPPFLAGS = \

Modified: gproject/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_GPROJECT include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src icons plugin = gproject

Modified: gproject/icons/Makefile.am 3 files changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -1,4 +1,3 @@ -if ENABLE_GPROJECT icondir = $(datadir)/icons/hicolor/16x16/apps

dist_icon_DATA = \ @@ -21,5 +20,3 @@ update-icon-cache: echo "*** Icon cache not updated. After (un)install, run this:"; \ echo "*** $(gtk_update_icon_cache)"; \ fi - -endif

Modified: gproject/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_GPROJECT geanyplugins_LTLIBRARIES = gproject.la -endif

gproject_la_SOURCES = \ gproject-main.c \

Modified: multiterm/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_MULTITERM include $(top_srcdir)/build/vars.auxfiles.mk -endif

AUXFILES = TODO

Modified: multiterm/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -3,9 +3,7 @@ include $(top_srcdir)/build/vars.docs.mk

plugin = multiterm

-if ENABLE_MULTITERM geanyplugins_LTLIBRARIES = multiterm.la -endif

multiterm_la_VALAFLAGS = \ --vapidir $(top_srcdir)/multiterm/src/vapi \

Modified: pretty-printer/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_PRETTY_PRINTER geanyplugins_LTLIBRARIES = pretty-printer.la -endif

pretty_printer_la_SOURCES = \ PluginEntry.h \

Modified: shiftcolumn/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_SHIFTCOLUMN include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src plugin = shiftcolumn

Modified: shiftcolumn/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_SHIFTCOLUMN geanyplugins_LTLIBRARIES = shiftcolumn.la -endif

shiftcolumn_la_SOURCES = shiftcolumn.c shiftcolumn_la_LIBADD = $(COMMONLIBS)

Modified: spellcheck/Makefile.am 3 files changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -1,7 +1,4 @@ -# if spellcheck is disabled, we should distribute its files, but not install -if ENABLE_SPELLCHECK include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src plugin = spellcheck

Modified: spellcheck/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_SPELLCHECK geanyplugins_LTLIBRARIES = spellcheck.la -endif

spellcheck_la_SOURCES = \ scplugin.h \

Modified: tableconvert/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_TABLECONVERT include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src plugin = tableconvert

Modified: tableconvert/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_TABLECONVERT geanyplugins_LTLIBRARIES = tableconvert.la -endif

tableconvert_la_SOURCES = tableconvert.c tableconvert_la_LIBADD = $(COMMONLIBS)

Modified: treebrowser/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_TREEBROWSER include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src plugin = treebrowser

Modified: treebrowser/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_TREEBROWSER geanyplugins_LTLIBRARIES = treebrowser.la -endif

treebrowser_la_SOURCES = treebrowser.c treebrowser_la_CFLAGS = $(AM_CFLAGS) $(GIO_CFLAGS)

Modified: updatechecker/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_UPDATECHECKER include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src plugin = updatechecker

Modified: updatechecker/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,9 +1,7 @@ include $(top_srcdir)/build/vars.build.mk plugin = updatechecker

-if ENABLE_UPDATECHECKER geanyplugins_LTLIBRARIES = updatechecker.la -endif

updatechecker_la_SOURCES = updatechecker.c updatechecker_la_CPPFLAGS = \

Modified: webhelper/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_WEBHELPER include $(top_srcdir)/build/vars.auxfiles.mk -endif

AUXFILES = TODO

Modified: webhelper/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,9 +1,7 @@ include $(top_srcdir)/build/vars.build.mk plugin = webhelper

-if ENABLE_WEBHELPER geanyplugins_LTLIBRARIES = webhelper.la -endif

GLIB_MKENUMS = @GLIB_MKENUMS@

Modified: xmlsnippets/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,6 +1,4 @@ -if ENABLE_XMLSNIPPETS include $(top_srcdir)/build/vars.auxfiles.mk -endif

SUBDIRS = src plugin = xmlsnippets

Modified: xmlsnippets/src/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,6 @@ include $(top_srcdir)/build/vars.build.mk

-if ENABLE_XMLSNIPPETS geanyplugins_LTLIBRARIES = xmlsnippets.la -endif

xmlsnippets_la_SOURCES = \ plugin.c plugin.h \

@@ Diff output truncated at 100000 characters. @@

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).