[Pkg-cli-libs-commits] [webkitgtk-sharp] 02/03: Unbreak parallel build.

[Andrew Shadura]

This is an automated email from the git hooks/post-receive script.

andrewsh pushed a commit to branch master
in repository webkitgtk-sharp.

commit bc448818d46da3a8fa49e0f626aff3723185ad6f
Author: Andrew Shadura <andrewsh at debian.org>
Date:   Mon Jan 18 19:23:32 2016 +0100

    Unbreak parallel build.
---
 debian/patches/01-parallel_mdoc.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 doc/Makefile.am                       |  7 +++----
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/debian/patches/01-parallel_mdoc.patch b/debian/patches/01-parallel_mdoc.patch
new file mode 100644
index 0000000..63d8288
--- /dev/null
+++ b/debian/patches/01-parallel_mdoc.patch
@@ -0,0 +1,26 @@
+Author: Andrew Shadura <andrewsh at debian.org>
+Description: Don't run things twice.
+
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -15,9 +15,6 @@
+ update:
+ 	$(MDOC) update $(SOUPSHARP_LIBS) --out=en $(ASSEMBLIES)
+ 
+-$(srcdir)/en/*/*.xml $(srcdir)/en/*.xml:
+-	$(MDOC) update $(SOUPSHARP_LIBS) --out=en $(ASSEMBLIES)
+-
+ $(ASSEMBLY_NAME)-docs.source:
+ 	@echo "Generating $@"
+ 	@echo "<?xml version=\"1.0\"?>" > $@
+@@ -25,7 +22,9 @@
+ 	@echo "  <source provider=\"ecma\" basefile=\"$(ASSEMBLY_NAME)-docs\" path=\"classlib-$(ASSEMBLY_SHORTNAME)\"/>" >> $@
+ 	@echo "</monodoc>" >> $@
+ 
+-$(ASSEMBLY_NAME)-docs.zip $(ASSEMBLY_NAME)-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
++$(ASSEMBLY_NAME)-docs.zip $(ASSEMBLY_NAME)-docs.tree: assemble
++
++assemble: update
+ 	$(MDASSEMBLER) --ecma $(srcdir)/en -o $(ASSEMBLY_NAME)-docs
+ 
+ CLEANFILES = $(TARGETS)
diff --git a/debian/patches/series b/debian/patches/series
index 24400a0..d7f8b59 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+01-parallel_mdoc.patch
 02-pkgconfig_library_path.patch
 03_dllmap.patch
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a9730d3..c553801 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -15,9 +15,6 @@ all: $(TARGETS)
 update:
 	$(MDOC) update $(SOUPSHARP_LIBS) --out=en $(ASSEMBLIES)
 
-$(srcdir)/en/*/*.xml $(srcdir)/en/*.xml:
-	$(MDOC) update $(SOUPSHARP_LIBS) --out=en $(ASSEMBLIES)
-
 $(ASSEMBLY_NAME)-docs.source:
 	@echo "Generating $@"
 	@echo "<?xml version=\"1.0\"?>" > $@
@@ -25,7 +22,9 @@ $(ASSEMBLY_NAME)-docs.source:
 	@echo "  <source provider=\"ecma\" basefile=\"$(ASSEMBLY_NAME)-docs\" path=\"classlib-$(ASSEMBLY_SHORTNAME)\"/>" >> $@
 	@echo "</monodoc>" >> $@
 
-$(ASSEMBLY_NAME)-docs.zip $(ASSEMBLY_NAME)-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
+$(ASSEMBLY_NAME)-docs.zip $(ASSEMBLY_NAME)-docs.tree: assemble
+
+assemble: update
 	$(MDASSEMBLER) --ecma $(srcdir)/en -o $(ASSEMBLY_NAME)-docs
 
 CLEANFILES = $(TARGETS)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/webkitgtk-sharp.git