pidgin/pidgin

Merged in CMaiku/pidgin (pull request #201)

2017-06-15, Gary Kramlich
e977b2e549d6
Parents c3ff4a87d1e67a7b0bfca940
Children 876661dc1375
Merged in CMaiku/pidgin (pull request #201)

Use built library when building GIR

Approved-by: Gary Kramlich
4 files changed, 8 insertions(+), 4 deletions(-)
  • +4 -1
    finch/Makefile.am
  • +1 -1
    libpurple/Makefile.am
  • +1 -1
    libpurple/data/purple-3-uninstalled.pc.in
  • +2 -1
    pidgin/Makefile.am
    • --- a/finch/Makefile.am Thu Jun 15 03:57:34 2017 +0000
    +++ b/finch/Makefile.am Thu Jun 15 04:00:41 2017 +0000
    @@ -130,7 +130,9 @@
    --warn-all \
    --add-include-path=$(prefix)/share/gir-1.0 \
    --add-include-path=$(builddir)/libgnt \
    - --add-include-path=$(top_builddir)/libpurple
    + --add-include-path=$(top_builddir)/libpurple \
    + --pkg=purple-$(PURPLE_MAJOR_VERSION) \
    + --pkg-export=finch
    INTROSPECTION_COMPILER_ARGS = \
    --includedir=$(prefix)/share/gir-1.0 \
    @@ -167,6 +169,7 @@
    Finch_3_0_gir_LIBS = $(builddir)/libfinch.la
    Finch_3_0_gir_FILES = $(introspection_sources)
    INTROSPECTION_GIRS += Finch-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir
    +INTROSPECTION_SCANNER_ENV = PKG_CONFIG_PATH=$(top_builddir)/libpurple/data/
    girdir = \
    $(prefix)/share/gir-1.0 \
    --- a/libpurple/Makefile.am Thu Jun 15 03:57:34 2017 +0000
    +++ b/libpurple/Makefile.am Thu Jun 15 04:00:41 2017 +0000
    @@ -494,7 +494,7 @@
    -include $(INTROSPECTION_MAKEFILE)
    INTROSPECTION_GIRS =
    -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(prefix)/share/gir-1.0 --warn-all
    +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(prefix)/share/gir-1.0 --warn-all --pkg-export=purple-$(PURPLE_MAJOR_VERSION)
    INTROSPECTION_COMPILER_ARGS = --includedir=$(prefix)/share/gir-1.0
    if HAVE_INTROSPECTION
    --- a/libpurple/data/purple-3-uninstalled.pc.in Thu Jun 15 03:57:34 2017 +0000
    +++ b/libpurple/data/purple-3-uninstalled.pc.in Thu Jun 15 04:00:41 2017 +0000
    @@ -19,4 +19,4 @@
    Version: @VERSION@
    Requires: glib-2.0
    Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
    -Libs: ${abs_builddir}/libpurple.la
    +Libs: ${abs_top_builddir}/libpurple/libpurple.la
    --- a/pidgin/Makefile.am Thu Jun 15 03:57:34 2017 +0000
    +++ b/pidgin/Makefile.am Thu Jun 15 04:00:41 2017 +0000
    @@ -264,7 +264,7 @@
    -include $(INTROSPECTION_MAKEFILE)
    INTROSPECTION_GIRS =
    -INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(top_builddir)/libpurple --add-include-path=$(prefix)/share/gir-1.0
    +INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(top_builddir)/libpurple --add-include-path=$(prefix)/share/gir-1.0 --pkg=purple-$(PURPLE_MAJOR_VERSION) --pkg-export=pidgin-$(PURPLE_MAJOR_VERSION)
    INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libpurple --includedir=$(prefix)/share/gir-1.0
    if HAVE_INTROSPECTION
    @@ -299,6 +299,7 @@
    Pidgin_3_0_gir_LIBS = $(builddir)/libpidgin.la
    Pidgin_3_0_gir_FILES = $(introspection_sources)
    INTROSPECTION_GIRS += Pidgin-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir
    +INTROSPECTION_SCANNER_ENV = PKG_CONFIG_PATH=$(top_builddir)/libpurple/data/
    girdir = $(prefix)/share/gir-1.0 $(INTROSPECTION_GIRDIR)
    gir_DATA = $(INTROSPECTION_GIRS)