From a687c31a4b18475fc72db8e696f8421b04bbe0be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sat, 27 Feb 2016 11:55:45 +0100 Subject: [PATCH] Define G_LOG_DOMAIN for all plugins where it is missing This helps to get proper log messages prefixed with the plugin name in Geany's Help->Debug Messages view as well as on console logging. --- autoclose/src/Makefile.am | 1 + automark/src/Makefile.am | 1 + codenav/src/Makefile.am | 1 + debugger/src/Makefile.am | 1 + defineformat/src/Makefile.am | 1 + devhelp/src/Makefile.am | 1 + geanydoc/src/Makefile.am | 2 +- geanyextrasel/src/Makefile.am | 1 + geanyinsertnum/src/Makefile.am | 1 + geanylatex/src/Makefile.am | 1 + geanylipsum/src/Makefile.am | 1 + geanylua/Makefile.am | 2 ++ geanymacro/src/Makefile.am | 1 + geanyminiscript/src/Makefile.am | 1 + geanynumberedbookmarks/src/Makefile.am | 1 + geanyprj/src/Makefile.am | 1 + geanysendmail/src/Makefile.am | 1 + geanyvc/src/Makefile.am | 1 + lineoperations/src/Makefile.am | 1 + markdown/src/Makefile.am | 1 + multiterm/src/Makefile.am | 1 + overview/overview/Makefile.am | 1 + pairtaghighlighter/src/Makefile.am | 1 + pretty-printer/src/Makefile.am | 1 + scope/src/Makefile.am | 1 + shiftcolumn/src/Makefile.am | 1 + tableconvert/src/Makefile.am | 1 + treebrowser/src/Makefile.am | 1 + xmlsnippets/src/Makefile.am | 1 + 29 files changed, 30 insertions(+), 1 deletion(-) diff --git a/autoclose/src/Makefile.am b/autoclose/src/Makefile.am index 7b953b57e..7c7e97672 100644 --- a/autoclose/src/Makefile.am +++ b/autoclose/src/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/build/vars.build.mk geanyplugins_LTLIBRARIES = autoclose.la autoclose_la_SOURCES = autoclose.c +autoclose_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"AutoClose\" autoclose_la_LIBADD = $(COMMONLIBS) include $(top_srcdir)/build/cppcheck.mk diff --git a/automark/src/Makefile.am b/automark/src/Makefile.am index b0f5186dd..d7000b537 100644 --- a/automark/src/Makefile.am +++ b/automark/src/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/build/vars.build.mk geanyplugins_LTLIBRARIES = automark.la automark_la_SOURCES = automark.c +automark_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"AutoMark\" automark_la_LIBADD = $(COMMONLIBS) include $(top_srcdir)/build/cppcheck.mk diff --git a/codenav/src/Makefile.am b/codenav/src/Makefile.am index 99e1f171a..53818a3be 100644 --- a/codenav/src/Makefile.am +++ b/codenav/src/Makefile.am @@ -12,6 +12,7 @@ codenav_la_SOURCES = \ utils.c \ utils.h +codenav_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"CodeNavigation\" codenav_la_LIBADD = $(COMMONLIBS) diff --git a/debugger/src/Makefile.am b/debugger/src/Makefile.am index 27fc864d2..a34e831e1 100644 --- a/debugger/src/Makefile.am +++ b/debugger/src/Makefile.am @@ -73,6 +73,7 @@ debugger_la_SOURCES = \ debugger_la_LIBADD = $(COMMONLIBS) $(VTE_LIBS) -lutil debugger_la_CFLAGS = $(AM_CFLAGS) $(VTE_CFLAGS) -DDBGPLUG_DATA_DIR=\"$(plugindatadir)\" -DPLUGIN_NAME=\"$(plugin)\" +debugger_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"Debugger\" check_PROGRAMS = gdb_mi_test dist_check_SCRIPTS = tests/gdb_mi_test.sh diff --git a/defineformat/src/Makefile.am b/defineformat/src/Makefile.am index 96217b575..3cd34e421 100644 --- a/defineformat/src/Makefile.am +++ b/defineformat/src/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/build/vars.build.mk geanyplugins_LTLIBRARIES = defineformat.la defineformat_la_SOURCES = defineformat.c +defineformat_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"DefineFormat\" defineformat_la_LIBADD = $(COMMONLIBS) include $(top_srcdir)/build/cppcheck.mk diff --git a/devhelp/src/Makefile.am b/devhelp/src/Makefile.am index 46354729f..47726cfc4 100644 --- a/devhelp/src/Makefile.am +++ b/devhelp/src/Makefile.am @@ -16,6 +16,7 @@ noinst_HEADERS = \ dhp.h \ dhp-plugin.h +devhelp_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"Devhelp\" devhelp_la_CFLAGS = \ $(AM_CFLAGS) \ -I$(top_srcdir)/devhelp \ diff --git a/geanydoc/src/Makefile.am b/geanydoc/src/Makefile.am index fb624ca58..aac73bf97 100644 --- a/geanydoc/src/Makefile.am +++ b/geanydoc/src/Makefile.am @@ -7,7 +7,7 @@ geanydoc_la_SOURCES = \ geanydoc.c \ geanydoc.h -geanydoc_la_CFLAGS = $(AM_CFLAGS) +geanydoc_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GeanyDoc\" geanydoc_la_LIBADD = $(COMMONLIBS) include $(top_srcdir)/build/cppcheck.mk diff --git a/geanyextrasel/src/Makefile.am b/geanyextrasel/src/Makefile.am index 36e9bc203..5fc72d2b2 100644 --- a/geanyextrasel/src/Makefile.am +++ b/geanyextrasel/src/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/build/vars.build.mk geanyplugins_LTLIBRARIES = geanyextrasel.la geanyextrasel_la_SOURCES = extrasel.c +geanyextrasel_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"ExtraSelection\" geanyextrasel_la_LIBADD = $(COMMONLIBS) include $(top_srcdir)/build/cppcheck.mk diff --git a/geanyinsertnum/src/Makefile.am b/geanyinsertnum/src/Makefile.am index 04caa293d..0121bbc93 100644 --- a/geanyinsertnum/src/Makefile.am +++ b/geanyinsertnum/src/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/build/vars.build.mk geanyplugins_LTLIBRARIES = geanyinsertnum.la geanyinsertnum_la_SOURCES = insertnum.c +geanyinsertnum_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"InsertNum\" geanyinsertnum_la_LIBADD = $(COMMONLIBS) include $(top_srcdir)/build/cppcheck.mk diff --git a/geanylatex/src/Makefile.am b/geanylatex/src/Makefile.am index 99ffa4a8a..04620c550 100644 --- a/geanylatex/src/Makefile.am +++ b/geanylatex/src/Makefile.am @@ -29,6 +29,7 @@ geanylatex_la_SOURCES = \ latexkeybindings.c \ letters.h +geanylatex_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GeanyLaTeX\" geanylatex_la_LIBADD = $(COMMONLIBS) include $(top_srcdir)/build/cppcheck.mk diff --git a/geanylipsum/src/Makefile.am b/geanylipsum/src/Makefile.am index 969b2ee40..c15618288 100644 --- a/geanylipsum/src/Makefile.am +++ b/geanylipsum/src/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/build/vars.build.mk geanyplugins_LTLIBRARIES = geanylipsum.la geanylipsum_la_SOURCES = geanylipsum.c +geanylipsum_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GeanyLipsum\" geanylipsum_la_LIBADD = $(COMMONLIBS) include $(top_srcdir)/build/cppcheck.mk diff --git a/geanylua/Makefile.am b/geanylua/Makefile.am index 469480110..6a8b055a2 100644 --- a/geanylua/Makefile.am +++ b/geanylua/Makefile.am @@ -31,12 +31,14 @@ geanylua_la_CFLAGS = \ $(GMODULE_CFLAGS) \ $(LUA_CFLAGS) +geanylua_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GeanyLua\" geanylua_la_LIBADD = \ $(COMMONLIBS) \ $(GMODULE_LIBS) \ $(LUA_LIBS) libgeanylua_la_CFLAGS = $(geanylua_la_CFLAGS) +libgeanylua_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GeanyLua\" libgeanylua_la_LIBADD = $(geanylua_la_LIBADD) SUBDIRS = docs examples diff --git a/geanymacro/src/Makefile.am b/geanymacro/src/Makefile.am index a19baea88..185729bef 100644 --- a/geanymacro/src/Makefile.am +++ b/geanymacro/src/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/build/vars.build.mk geanyplugins_LTLIBRARIES = geanymacro.la geanymacro_la_SOURCES = geanymacro.c +geanymacro_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GeanyMacro\" geanymacro_la_LIBADD = $(COMMONLIBS) include $(top_srcdir)/build/cppcheck.mk diff --git a/geanyminiscript/src/Makefile.am b/geanyminiscript/src/Makefile.am index bc7c7a5a8..7b1f45d07 100644 --- a/geanyminiscript/src/Makefile.am +++ b/geanyminiscript/src/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/build/vars.build.mk geanyplugins_LTLIBRARIES = geanyminiscript.la geanyminiscript_la_SOURCES = gms.c gms.h gms_gui.c gms_gui.h gms_debug.h +geanyminiscript_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GeanyMiniScript\" geanyminiscript_la_LIBADD = $(COMMONLIBS) include $(top_srcdir)/build/cppcheck.mk diff --git a/geanynumberedbookmarks/src/Makefile.am b/geanynumberedbookmarks/src/Makefile.am index 455aca5b1..0ddff3d5f 100644 --- a/geanynumberedbookmarks/src/Makefile.am +++ b/geanynumberedbookmarks/src/Makefile.am @@ -3,4 +3,5 @@ include $(top_srcdir)/build/vars.build.mk geanyplugins_LTLIBRARIES = geanynumberedbookmarks.la geanynumberedbookmarks_la_SOURCES = geanynumberedbookmarks.c +geanynumberedbookmarks_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GeanyNumberedBookmarks\" geanynumberedbookmarks_la_LIBADD = $(COMMONLIBS) diff --git a/geanyprj/src/Makefile.am b/geanyprj/src/Makefile.am index a7c7e7b5c..b042455f8 100644 --- a/geanyprj/src/Makefile.am +++ b/geanyprj/src/Makefile.am @@ -11,6 +11,7 @@ geanyprj_la_SOURCES = geanyprj.c \ xproject.c geanyprj_la_CFLAGS = $(AM_CFLAGS) +geanyprj_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GeanyPrj\" geanyprj_la_LIBADD = $(COMMONLIBS) if UNITTESTS diff --git a/geanysendmail/src/Makefile.am b/geanysendmail/src/Makefile.am index 3e2f541d9..8f13671f8 100644 --- a/geanysendmail/src/Makefile.am +++ b/geanysendmail/src/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/build/vars.build.mk geanyplugins_LTLIBRARIES = geanysendmail.la geanysendmail_la_SOURCES = geanysendmail.c mail-icon.xpm +geanysendmail_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GeanySendMail\" geanysendmail_la_LIBADD = $(COMMONLIBS) include $(top_srcdir)/build/cppcheck.mk diff --git a/geanyvc/src/Makefile.am b/geanyvc/src/Makefile.am index 262224b8f..8016ce869 100644 --- a/geanyvc/src/Makefile.am +++ b/geanyvc/src/Makefile.am @@ -18,6 +18,7 @@ geanyvc_la_CFLAGS = \ $(AM_CFLAGS) \ $(GTKSPELL_CFLAGS) +geanyvc_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GeanyVC\" geanyvc_la_LIBADD = \ $(GTKSPELL_LIBS) \ $(COMMONLIBS) diff --git a/lineoperations/src/Makefile.am b/lineoperations/src/Makefile.am index 724bf6bd5..844b1dc9a 100644 --- a/lineoperations/src/Makefile.am +++ b/lineoperations/src/Makefile.am @@ -7,6 +7,7 @@ lineoperations_la_SOURCES = \ linefunctions.c \ lineoperations.c +lineoperations_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"LineOperations\" lineoperations_la_LIBADD = $(COMMONLIBS) include $(top_srcdir)/build/cppcheck.mk diff --git a/markdown/src/Makefile.am b/markdown/src/Makefile.am index f4a15626b..9ef3c6d83 100644 --- a/markdown/src/Makefile.am +++ b/markdown/src/Makefile.am @@ -22,6 +22,7 @@ markdown_la_CFLAGS = \ -DMARKDOWN_DOC_DIR=\"$(docdir)/markdown\" \ -DMARKDOWN_HELP_FILE=\"$(docdir)/markdown/html/help.html\" +markdown_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"Markdown\" markdown_la_LIBADD = \ $(COMMONLIBS) \ $(MARKDOWN_LIBS) diff --git a/multiterm/src/Makefile.am b/multiterm/src/Makefile.am index 7e59412d8..400e662df 100644 --- a/multiterm/src/Makefile.am +++ b/multiterm/src/Makefile.am @@ -23,6 +23,7 @@ multiterm_la_SOURCES = \ tab-label.vala \ terminal.vala +multiterm_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"MultiTerm\" multiterm_la_CFLAGS = \ -DGETTEXT_PACKAGE='"$(GETTEXT_PACKAGE)"' \ $(AM_CFLAGS) \ diff --git a/overview/overview/Makefile.am b/overview/overview/Makefile.am index 17cd2b2cb..006e53b3c 100644 --- a/overview/overview/Makefile.am +++ b/overview/overview/Makefile.am @@ -18,6 +18,7 @@ overview_la_SOURCES = \ overviewui.c \ overviewui.h +overview_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"Overview\" overview_la_CFLAGS = \ $(AM_CFLAGS) \ -I$(srcdir)/.. \ diff --git a/pairtaghighlighter/src/Makefile.am b/pairtaghighlighter/src/Makefile.am index ac781c53d..a396aa4c9 100644 --- a/pairtaghighlighter/src/Makefile.am +++ b/pairtaghighlighter/src/Makefile.am @@ -4,6 +4,7 @@ geanyplugins_LTLIBRARIES = pairtaghighlighter.la pairtaghighlighter_la_SOURCES = pair_tag_highlighter.c +pairtaghighlighter_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"PairTagHighlighter\" pairtaghighlighter_la_LIBADD = $(COMMONLIBS) include $(top_srcdir)/build/cppcheck.mk diff --git a/pretty-printer/src/Makefile.am b/pretty-printer/src/Makefile.am index ee311bb78..4d65fbf2e 100644 --- a/pretty-printer/src/Makefile.am +++ b/pretty-printer/src/Makefile.am @@ -10,6 +10,7 @@ pretty_printer_la_SOURCES = \ ConfigUI.h \ ConfigUI.c +pretty_printer_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"PrettyPrinter\" pretty_printer_la_CFLAGS = $(AM_CFLAGS) $(LIBXML_CFLAGS) -DHAVE_GLIB -DHAVE_LIBXML pretty_printer_la_LIBADD = $(COMMONLIBS) $(LIBXML_LIBS) diff --git a/scope/src/Makefile.am b/scope/src/Makefile.am index d30a52c69..6f26339a7 100644 --- a/scope/src/Makefile.am +++ b/scope/src/Makefile.am @@ -53,6 +53,7 @@ scope_la_SOURCES = \ scope_la_LIBADD = $(COMMONLIBS) $(VTE_LIBS) $(PTY_LIBS) +scope_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"Scope\" scope_la_CFLAGS = $(AM_CFLAGS) $(VTE_CFLAGS) \ -DPLUGINDATADIR=\"$(plugindatadir)\" \ -DPLUGINHTMLDOCDIR=\"$(plugindocdir)/html\" \ diff --git a/shiftcolumn/src/Makefile.am b/shiftcolumn/src/Makefile.am index 2253824a7..dbe5d5544 100644 --- a/shiftcolumn/src/Makefile.am +++ b/shiftcolumn/src/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/build/vars.build.mk geanyplugins_LTLIBRARIES = shiftcolumn.la shiftcolumn_la_SOURCES = shiftcolumn.c +shiftcolumn_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"ShiftColumn\" shiftcolumn_la_LIBADD = $(COMMONLIBS) include $(top_srcdir)/build/cppcheck.mk diff --git a/tableconvert/src/Makefile.am b/tableconvert/src/Makefile.am index a43291bdf..cb57b6007 100644 --- a/tableconvert/src/Makefile.am +++ b/tableconvert/src/Makefile.am @@ -7,6 +7,7 @@ tableconvert_la_SOURCES = \ tableconvert.h \ tableconvert_ui.c \ tableconvert_ui.h +tableconvert_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"TableConvert\" tableconvert_la_LIBADD = $(COMMONLIBS) include $(top_srcdir)/build/cppcheck.mk diff --git a/treebrowser/src/Makefile.am b/treebrowser/src/Makefile.am index d9a29c44e..43ec95e1a 100644 --- a/treebrowser/src/Makefile.am +++ b/treebrowser/src/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/build/vars.build.mk geanyplugins_LTLIBRARIES = treebrowser.la treebrowser_la_SOURCES = treebrowser.c +treebrowser_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"TreeBrowser\" treebrowser_la_CFLAGS = $(AM_CFLAGS) $(GIO_CFLAGS) treebrowser_la_LIBADD = $(COMMONLIBS) $(GIO_LIBS) diff --git a/xmlsnippets/src/Makefile.am b/xmlsnippets/src/Makefile.am index 652efebdf..0b2a30e5e 100644 --- a/xmlsnippets/src/Makefile.am +++ b/xmlsnippets/src/Makefile.am @@ -10,6 +10,7 @@ xmlsnippets_la_SOURCES = \ plugin.c plugin.h \ $(common_sources) +xmlsnippets_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"XMLSnippets\" xmlsnippets_la_LIBADD = $(COMMONLIBS) xmlsnippets_check_SOURCES = \