Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'cleanup_build' into 'master'
General build clean up. Contributes to JB#51077 See merge request mer-core/telepathy-gabble!5
- Loading branch information
Showing
9 changed files
with
145 additions
and
155 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 0 additions & 23 deletions
23
rpm/0001-Disable-parallel-build-for-extensions-directory.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| From ca7a513154df04d9d44e93856358ad4f93637e19 Mon Sep 17 00:00:00 2001 | ||
| From: "Ruslan N. Marchenko" <me@ruff.mobi> | ||
| Date: Thu, 23 Apr 2020 23:54:18 +0200 | ||
| Subject: [PATCH] Make GTK Docs optional | ||
|
|
||
| --- | ||
| autogen.sh | 2 +- | ||
| configure.ac | 6 ++++++ | ||
| docs/Makefile.am | 2 ++ | ||
| docs/reference/Makefile.am | 2 ++ | ||
| 4 files changed, 11 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/autogen.sh b/autogen.sh | ||
| index 0d8e27d..76741cb 100755 | ||
| --- a/autogen.sh | ||
| +++ b/autogen.sh | ||
| @@ -1,7 +1,7 @@ | ||
| #!/bin/sh | ||
| set -e | ||
|
|
||
| -gtkdocize || exit 1 | ||
| +which gtkdocize && ( gtkdocize || exit 1 ) || echo "EXTRA_DIST = " > gtk-doc.make | ||
|
|
||
| if test -n "$AUTOMAKE"; then | ||
| : # don't override an explicit user request | ||
| diff --git a/configure.ac b/configure.ac | ||
| index 779e90c..000daf7 100644 | ||
| --- a/configure.ac | ||
| +++ b/configure.ac | ||
| @@ -278,7 +278,13 @@ dnl To be used by tests and examples | ||
| WOCKY_CFLAGS='-I${top_builddir} -I${top_srcdir}' | ||
| AC_SUBST(WOCKY_CFLAGS) | ||
|
|
||
| +# check for gtk-doc | ||
| +m4_ifdef([GTK_DOC_CHECK], [ | ||
| GTK_DOC_CHECK([1.17],[--flavour no-tmpl]) | ||
| +],[ | ||
| +AM_CONDITIONAL([ENABLE_GTK_DOC], false) | ||
| +]) | ||
| + | ||
|
|
||
| AC_OUTPUT( Makefile \ | ||
| wocky/Makefile \ | ||
| diff --git a/docs/Makefile.am b/docs/Makefile.am | ||
| index f3ddc22..d216247 100644 | ||
| --- a/docs/Makefile.am | ||
| +++ b/docs/Makefile.am | ||
| @@ -1 +1,3 @@ | ||
| +if ENABLE_GTK_DOC | ||
| SUBDIRS = reference | ||
| +endif | ||
| diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am | ||
| index 2e1b628..2e679bb 100644 | ||
| --- a/docs/reference/Makefile.am | ||
| +++ b/docs/reference/Makefile.am | ||
| @@ -2,6 +2,7 @@ | ||
|
|
||
| # We require automake 1.6 at least. | ||
| AUTOMAKE_OPTIONS = 1.6 | ||
| +if ENABLE_GTK_DOC | ||
|
|
||
| # This is a blank Makefile.am for using gtk-doc. | ||
| # Copy this to your project's API docs directory and modify the variables to | ||
| @@ -101,3 +102,4 @@ DISTCLEANFILES = wocky-sections.txt wocky.types | ||
| # Comment this out if you want your docs-status tested during 'make check' | ||
| #TESTS = $(GTKDOC_CHECK) | ||
|
|
||
| +endif #ENABLE_GTK_DOC | ||
| -- | ||
| 2.28.0 | ||
|
|
Oops, something went wrong.