From 8804a5df1dffb2511aa2e326d1a4139ef2041083 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 20 Nov 2016 17:52:07 +0100 Subject: [PATCH] contrib/rpm: no longer manually pre-build parts for `make dist` `make dist` should have now the proper dependencies to build everything that is needed automatically. No need for manually calling make first. --- contrib/fedora/rpm/build_clean.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/contrib/fedora/rpm/build_clean.sh b/contrib/fedora/rpm/build_clean.sh index d8060cbabd..71e63a90eb 100755 --- a/contrib/fedora/rpm/build_clean.sh +++ b/contrib/fedora/rpm/build_clean.sh @@ -110,18 +110,11 @@ if [[ $IGNORE_DIRTY != 1 ]]; then fi if [[ $NO_DIST != 1 ]]; then - ./autogen.sh --enable-gtk-doc || die "Error autogen.sh" - + ./autogen.sh --enable-gtk-doc --with-introspection --with-libnm-glib || die "Error autogen.sh" if [[ $QUICK == 1 ]]; then - make -C introspection || die "Error make -C introspection" - make -C libnm-core || die "Error make -C libnm-core" - make -C libnm || die "Error make -C libnm" - make -C libnm-util || die "Error make -C libnm-util" - make -C libnm-glib || die "Error make -C libnm-glib" - make dist || die "Error make distcheck" + make dist -j 7 || die "Error make dist" else - make -j 10 || die "Error make" - make distcheck || die "Error make distcheck" + make distcheck -j 7 || die "Error make distcheck" fi fi