From 25e5fb1678c9022f82936962445d7e620614aada Mon Sep 17 00:00:00 2001
From: Nicola Fontana <ntd@entidi.it>
Date: Wed, 1 Apr 2015 20:03:57 +0200
Subject: [PATCH] build: share dist flags

The flags for configuring dist releases [1] are now shared. Avoid
guessing the proper number of jobs to pass and use "make -j" without
value instead.

[1] "make distcheck" and "make installer"
---
 Makefile.am | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 878850b4..1fdc3470 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,11 +10,13 @@ xml2txt_command=		$(AM_V_GEN)if test -x $(XSLTPROC) ; then : ; else \
 hicolor_snapshot=		build/hicolor-snapshot-0.11.tar.bz2
 minitheme_snapshot=		build/minitheme-snapshot.tar.bz2
 ACLOCAL_AMFLAGS=		-I build
-AM_DISTCHECK_CONFIGURE_FLAGS=	--enable-pango \
+ADG_DIST_CONFIGURE_FLAGS=	--enable-pango \
+				--with-gtk=gtk3 \
 				--enable-gtk-doc \
+				--enable-gtk-doc-html
+AM_DISTCHECK_CONFIGURE_FLAGS=	$(ADG_DIST_CONFIGURE_FLAGS) \
 				--enable-test-framework \
 				--enable-introspection \
-				--with-gtk \
 				--with-glade-catalogdir
 
 BUILT_SOURCES=			ChangeLog \
@@ -73,6 +75,7 @@ _host:
 _host/docs/adg/adg.pdf: _host $(srcdir)/configure
 	cd _host ; \
 	$(abs_srcdir)/configure \
+		$(ADG_DIST_CONFIGURE_FLAGS) \
 		--prefix= \
 		--disable-dependency-tracking \
 		--disable-fast-install \
@@ -80,10 +83,8 @@ _host/docs/adg/adg.pdf: _host $(srcdir)/configure
 		--disable-introspection \
 		--disable-test-framework \
 		--without-glade-catalogdir \
-		--enable-gtk-doc \
-		--enable-gtk-doc-html \
 		--enable-gtk-doc-pdf && \
-	$(MAKE) -j7 ; \
+	$(MAKE) -j ; \
 	cd ..
 
 _host/hicolor: _host $(srcdir)/$(hicolor_snapshot)
-- 
2.11.4.GIT