[geany/geany-plugins] 85ed43: Define PLUGIN and PLUGIN{DATA, DOC, LIB}DIR for all plugins - Plugins-Commits

12 Mar 2016


      Branch:      refs/heads/master
Author:      Colomban Wendling ban@herbesfolles.org
Committer:   Colomban Wendling ban@herbesfolles.org
Date:        Sat, 12 Mar 2016 18:36:06 UTC
Commit:      85ed43873e440b11781140f0ae43e9d733a7e744
             https://github.com/geany/geany-plugins/commit/85ed43873e440b11781140f0ae43e9...
Log Message:
-----------
Define PLUGIN and PLUGIN{DATA,DOC,LIB}DIR for all plugins
This helps for locating data files, and to define those appropriately
depending on the platform (Windows).
Modified Paths:
--------------
    addons/src/Makefile.am
    autoclose/src/Makefile.am
    automark/src/Makefile.am
    build/vars.build.mk
    codenav/src/Makefile.am
    commander/src/Makefile.am
    defineformat/src/Makefile.am
    geanyctags/src/Makefile.am
    geanydoc/src/Makefile.am
    geanydoc/tests/Makefile.am
    geanyextrasel/src/Makefile.am
    geanyinsertnum/src/Makefile.am
    geanylatex/src/Makefile.am
    geanylipsum/src/Makefile.am
    geanymacro/src/Makefile.am
    geanyminiscript/src/Makefile.am
    geanynumberedbookmarks/src/Makefile.am
    geanypg/src/Makefile.am
    geanyprj/src/Makefile.am
    geanypy/src/Makefile.am
    geanysendmail/src/Makefile.am
    geanyvc/src/Makefile.am
    geniuspaste/src/Makefile.am
    git-changebar/src/Makefile.am
    lineoperations/src/Makefile.am
    pairtaghighlighter/src/Makefile.am
    pretty-printer/src/Makefile.am
    projectorganizer/src/Makefile.am
    scope/src/Makefile.am
    shiftcolumn/src/Makefile.am
    spellcheck/src/Makefile.am
    tableconvert/src/Makefile.am
    treebrowser/src/Makefile.am
    xmlsnippets/src/Makefile.am
Modified: addons/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = addons
geanyplugins_LTLIBRARIES = addons.la
Modified: autoclose/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = autoclose
geanyplugins_LTLIBRARIES = autoclose.la
Modified: automark/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = automark
geanyplugins_LTLIBRARIES = automark.la
Modified: build/vars.build.mk
4 lines changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -20,6 +20,10 @@ endif
AM_CFLAGS = \
    ${LOCAL_AM_CFLAGS} \
+	-DPLUGIN=""$(plugin)"" \
+	-DPLUGINDATADIR="PKGDATADIR"/"PLUGIN" \
+	-DPLUGINDOCDIR="DOCDIR"/"PLUGIN" \
+	-DPLUGINLIBDIR="PKGLIBDIR"/"PLUGIN" \
    $(GEANY_CFLAGS) \
    $(GP_CFLAGS)
Modified: codenav/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = codenav
geanyplugins_LTLIBRARIES = codenav.la
Modified: commander/src/Makefile.am
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -6,7 +6,6 @@ geanyplugins_LTLIBRARIES = commander.la
commander_la_SOURCES  = commander-plugin.c
 commander_la_CPPFLAGS = $(AM_CPPFLAGS) \
-                        -DPLUGIN="$(plugin)" \
                         -DG_LOG_DOMAIN="Commander"
 commander_la_CFLAGS   = $(AM_CFLAGS) \
                         $(COMMANDER_CFLAGS)
Modified: defineformat/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = defineformat
geanyplugins_LTLIBRARIES = defineformat.la
Modified: geanyctags/src/Makefile.am
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -9,7 +9,6 @@ geanyctags_la_SOURCES = \
    readtags.c
geanyctags_la_CPPFLAGS = $(AM_CPPFLAGS) \
-	-DPLUGIN="$(plugin)" \
    -DG_LOG_DOMAIN="GeanyCtags"
 geanyctags_la_CFLAGS = $(AM_CFLAGS)
 geanyctags_la_LIBADD = $(COMMONLIBS)
Modified: geanydoc/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanydoc
geanyplugins_LTLIBRARIES = geanydoc.la
Modified: geanydoc/tests/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,5 +1,6 @@
 if UNITTESTS
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanydoc
 TESTS=unittests
 noinst_PROGRAMS=unittests
 unittests_SOURCES = unittests.c
Modified: geanyextrasel/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanyextrasel
geanyplugins_LTLIBRARIES = geanyextrasel.la
Modified: geanyinsertnum/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanyinsertnum
geanyplugins_LTLIBRARIES = geanyinsertnum.la
Modified: geanylatex/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanylatex
geanyplugins_LTLIBRARIES = geanylatex.la
Modified: geanylipsum/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanylipsum
geanyplugins_LTLIBRARIES = geanylipsum.la
Modified: geanymacro/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanymacro
geanyplugins_LTLIBRARIES = geanymacro.la
Modified: geanyminiscript/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanyminiscript
geanyplugins_LTLIBRARIES = geanyminiscript.la
Modified: geanynumberedbookmarks/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanynumberedbookmarks
geanyplugins_LTLIBRARIES = geanynumberedbookmarks.la
Modified: geanypg/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanypg
geanyplugins_LTLIBRARIES = geanypg.la
Modified: geanyprj/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanyprj
geanyplugins_LTLIBRARIES = geanyprj.la
Modified: geanypy/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanypy
geanyplugin_LTLIBRARIES		=	geanypy.la
 geanyplugindir				=	$(libdir)/geany
Modified: geanysendmail/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanysendmail
geanyplugins_LTLIBRARIES = geanysendmail.la
Modified: geanyvc/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = geanyvc
geanyplugins_LTLIBRARIES = geanyvc.la
Modified: geniuspaste/src/Makefile.am
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -7,7 +7,6 @@ geanyplugins_LTLIBRARIES = geniuspaste.la
 geniuspaste_la_SOURCES = geniuspaste.c
 geniuspaste_la_CPPFLAGS = \
    $(AM_CPPFLAGS) \
-	-DPLUGINDATADIR="$(plugindatadir)" \
    -DGEANY_VERSION="$(GEANY_VERSION)" \
    -DG_LOG_DOMAIN="GeniusPaste"
 geniuspaste_la_CFLAGS = \
Modified: git-changebar/src/Makefile.am
3 lines changed, 1 insertions(+), 2 deletions(-)
===================================================================
@@ -4,8 +4,7 @@ plugin = git-changebar
 geanyplugins_LTLIBRARIES = git-changebar.la
git_changebar_la_SOURCES  = gcb-plugin.c
-git_changebar_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN="GitChangeBar" \
-                            -DPLUGIN=""$(plugin)""
+git_changebar_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN="GitChangeBar"
 git_changebar_la_CFLAGS   = $(AM_CFLAGS) $(GITCHANGEBAR_CFLAGS)
 git_changebar_la_LIBADD   = $(COMMONLIBS) \
                             $(GITCHANGEBAR_LIBS)
Modified: lineoperations/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = lineoperations
geanyplugins_LTLIBRARIES = lineoperations.la
Modified: pairtaghighlighter/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = pairtaghighlighter
geanyplugins_LTLIBRARIES = pairtaghighlighter.la
Modified: pretty-printer/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = pretty-printer
geanyplugins_LTLIBRARIES = pretty-printer.la
Modified: projectorganizer/src/Makefile.am
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = projectorganizer
geanyplugins_LTLIBRARIES = projectorganizer.la
@@ -14,7 +15,6 @@ projectorganizer_la_SOURCES = \
    prjorg-menu.c
projectorganizer_la_CPPFLAGS = $(AM_CPPFLAGS) \
-	-DPLUGIN="$(plugin)" \
    -DG_LOG_DOMAIN="ProjectOrganizer"
 projectorganizer_la_CFLAGS = $(AM_CFLAGS)
 projectorganizer_la_LIBADD = $(COMMONLIBS)
Modified: scope/src/Makefile.am
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -54,7 +54,6 @@ scope_la_SOURCES = \
 scope_la_LIBADD = $(COMMONLIBS) $(VTE_LIBS) $(PTY_LIBS)
scope_la_CFLAGS = $(AM_CFLAGS) $(VTE_CFLAGS) \
-	-DPLUGINDATADIR="$(plugindatadir)" \
    -DPLUGINHTMLDOCDIR="$(plugindocdir)/html" \
    -Wno-shadow
Modified: shiftcolumn/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = shiftcolumn
geanyplugins_LTLIBRARIES = shiftcolumn.la
Modified: spellcheck/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = spellcheck
geanyplugins_LTLIBRARIES = spellcheck.la
Modified: tableconvert/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = tableconvert
geanyplugins_LTLIBRARIES = tableconvert.la
Modified: treebrowser/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = treebrowser
geanyplugins_LTLIBRARIES = treebrowser.la
Modified: xmlsnippets/src/Makefile.am
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -1,4 +1,5 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = xmlsnippets
geanyplugins_LTLIBRARIES = xmlsnippets.la
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    