pidgin/pidgin

Merged in CMaiku/pidgin (pull request #162)

2016-10-25, Gary Kramlich
783878958371
Parents afd26b9ce14d6dc8cae57962
Children 9aeedc02a0e4aa6374affb29bea4cc95b40f
Merged in CMaiku/pidgin (pull request #162)

Fix distcheck
6 files changed, 29 insertions(+), 7 deletions(-)
  • +5 -3
    Makefile.am
  • +1 -1
    bitbucket-pipelines.yml
  • +0 -1
    doc/reference/protocols/facebook/Makefile.am
  • +21 -2
    libpurple/Makefile.am
  • +1 -0
    libpurple/protocols/yahoo/Makefile.am
  • +1 -0
    po/POTFILES.skip
    • --- a/Makefile.am Tue Oct 25 19:48:12 2016 +0000
    +++ b/Makefile.am Tue Oct 25 19:48:55 2016 +0000
    @@ -14,6 +14,8 @@
    m4macros/introspection.m4 \
    package_revision.h \
    po/Makefile.mingw \
    + tap-driver.sh \
    + tap-test \
    valgrind-suppressions
    noinst_HEADERS = config.h package_revision.h
    @@ -27,6 +29,9 @@
    $(AM_V_at)if [ ! -f "$(top_builddir)libpurple/libpurple.la" ]; then \
    $(MAKE) -C libpurple libpurple.la; \
    fi
    + $(AM_V_at)if [ ! -f "$(top_builddir)libpurple/protocols/facebook/libfacebook.la" ]; then \
    + $(MAKE) -C libpurple/protocols/facebook libfacebook.la; \
    + fi
    if ENABLE_GNT
    $(AM_V_at)if [ ! -f "$(top_builddir)finch/libgnt/libgnt.la" ]; then \
    $(MAKE) -C finch/libgnt libgnt.la; \
    @@ -46,9 +51,6 @@
    dist-hook:
    rm $(distdir)/config.h
    -distcheck-hook: libpurple/plugins/perl/common/Purple.pm pidgin/plugins/perl/common/Pidgin.pm
    -# cp libpurple/plugins/perl/common/Gaim.pm $(distdir)/libpurple/plugins/perl/common
    -
    commit-check:
    (cd po ; intltool-update -m 2>&1 | grep -v '^mismatched quotes.*\.py$$' | sed "s|current directory|po directory|" | grep . ; if [ $$? = 0 ] ; then exit 1 ; else exit 0 ; fi)
    --- a/bitbucket-pipelines.yml Tue Oct 25 19:48:12 2016 +0000
    +++ b/bitbucket-pipelines.yml Tue Oct 25 19:48:55 2016 +0000
    @@ -7,7 +7,7 @@
    - set -ex
    - ./autogen.sh --enable-debug --enable-gtk-doc
    - make -s -j$(nproc)
    - - make -s -j$(nproc) check
    + - make -s -j$(nproc) distcheck
    branches:
    release-2.x.y:
    - step:
    --- a/doc/reference/protocols/facebook/Makefile.am Tue Oct 25 19:48:12 2016 +0000
    +++ b/doc/reference/protocols/facebook/Makefile.am Tue Oct 25 19:48:55 2016 +0000
    @@ -106,7 +106,6 @@
    # Other files to distribute
    # e.g. EXTRA_DIST += version.xml.in
    -EXTRA_DIST += version.xml.in
    # Files not to distribute
    # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
    --- a/libpurple/Makefile.am Tue Oct 25 19:48:12 2016 +0000
    +++ b/libpurple/Makefile.am Tue Oct 25 19:48:55 2016 +0000
    @@ -282,11 +282,16 @@
    $(AM_V_GEN)echo "#include \"marshallers.h\"" > marshallers.c
    $(AM_V_at)$(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --body >> marshallers.c
    +# glib-mkenums doesn't handle VPATHs well, sed is used here to fix the
    +# include paths and documentation.
    +# Escaping possible . in $(srcdir) to \. for sed pattern.
    enums.h: $(srcdir)/enums.h.in $(purple_enumheaders)
    $(AM_V_GEN)$(GLIB_MKENUMS) --template $(srcdir)/enums.h.in $(purple_enumheaders) > $@
    + sed -i 's,$(subst .,\.,$(srcdir))/,,g' $@
    enums.c: $(srcdir)/enums.c.in $(purple_enumheaders)
    $(AM_V_GEN)$(GLIB_MKENUMS) --template $(srcdir)/enums.c.in $(purple_enumheaders) > $@
    + sed -i 's,$(subst .,\.,$(srcdir))/,,g' $@
    CLEANFILES = \
    enums.c \
    @@ -294,6 +299,9 @@
    marshallers.c \
    marshallers.h
    +DISTCLEANFILES = \
    + data/purple-url-handler.desktop
    +
    if ENABLE_DBUS
    CLEANFILES += \
    @@ -318,10 +326,14 @@
    prefs.h presence.h roomlist.h savedstatuses.h smiley.h smiley-list.h \
    status.h server.h util.h xmlnode.h protocol.h protocols.h
    +# Filter out enums.h and marshallers.h as they don't actually generate
    +# anything. This way making from a VPATH and distcheck doesn't fail due
    +# to not being able to find the enums.h or marshallers.h files if
    +# they've already been generated in the $(srcdir).
    purple_build_coreheaders = $(addprefix $(srcdir)/, $(purple_coreheaders)) \
    $(addprefix $(srcdir)/ciphers/, $(purple_cipherheaders)) \
    $(addprefix $(srcdir)/media/, $(purple_mediaheaders)) \
    - $(purple_builtheaders)
    + $(filter-out: enums.h marshallers.h, $(purple_builtheaders))
    dbus_build_exported = $(addprefix $(srcdir)/, $(dbus_exported))
    # We should probably make this better
    dbus_signals = $(addprefix $(srcdir)/, $(purple_coresources)) \
    @@ -342,7 +354,10 @@
    dbus-server.$(OBJEXT): dbus-bindings.c dbus-signals.c dbus-types.c dbus-types.h
    dbus-server.lo: dbus-bindings.c dbus-signals.c dbus-types.c dbus-types.h
    -$(libpurple_la_OBJECTS): dbus-types.h
    +
    +# Declare these as dependencies so they're built even if `make distcheck`
    +# is run immediately after configuring.
    +$(libpurple_la_OBJECTS): dbus-types.h enums.h marshallers.h
    # libpurple-client
    @@ -393,6 +408,10 @@
    BUILT_SOURCES = $(purple_builtheaders) $(purple_builtsources)
    +# Declare these as dependencies so they're built even if `make distcheck`
    +# is run immediately after configuring.
    +$(libpurple_la_OBJECTS): enums.h marshallers.h
    +
    endif
    lib_LTLIBRARIES = libpurple.la $(libpurple_client_lib)
    --- a/libpurple/protocols/yahoo/Makefile.am Tue Oct 25 19:48:12 2016 +0000
    +++ b/libpurple/protocols/yahoo/Makefile.am Tue Oct 25 19:48:55 2016 +0000
    @@ -1,6 +1,7 @@
    SUBDIRS = tests
    EXTRA_DIST = \
    + yahoojp.c \
    Makefile.mingw
    pkgdir = @PURPLE_PLUGINDIR@
    --- a/po/POTFILES.skip Tue Oct 25 19:48:12 2016 +0000
    +++ b/po/POTFILES.skip Tue Oct 25 19:48:55 2016 +0000
    @@ -69,6 +69,7 @@
    pidgin/plugins/perl/common/GtkThemes.c
    pidgin/plugins/perl/common/GtkUtils.c
    pidgin/plugins/perl/common/Pidgin.c
    +sub/libpurple/data/purple-url-handler.desktop.in
    sub/libpurple/plugins/perl/common/Account.c
    sub/libpurple/plugins/perl/common/AccountOpts.c
    sub/libpurple/plugins/perl/common/BuddyIcon.c