From: Daniel Elstner <redacted>
Date: Thu, 10 Sep 2015 17:35:17 +0000 (+0200)
Subject: Build: Use GNUMAKEFLAGS for --no-print-directory
X-Git-Tag: libsigrok-0.4.0~315
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=bcc3694ff76ce61ab3754b4ad3e1a27bc8ea162b;p=libsigrok.git

Build: Use GNUMAKEFLAGS for --no-print-directory
---

diff --git a/Makefile.am b/Makefile.am
index 4ad82912..b2c307e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 AM_LIBTOOLFLAGS = --silent
+GNUMAKEFLAGS = --no-print-directory
 
 FIRMWARE_DIR = $(datadir)/sigrok-firmware
 
diff --git a/configure.ac b/configure.ac
index 31efdac5..83604894 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,8 @@ AH_TOP([#ifndef SR_CONFIG_H
 #define SR_CONFIG_H    /* To stop multiple inclusions. */])
 AH_BOTTOM([#endif /* SR_CONFIG_H */])
 
+AC_CANONICAL_HOST
+
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
@@ -51,7 +53,6 @@ SR_PROG_VERSION([$CC], [sr_cc_version])
 SR_PROG_VERSION([$CXX], [sr_cxx_version])
 
 # Check for optional make features.
-SR_PROG_MAKE_NO_PRINT_DIRECTORY
 SR_PROG_MAKE_ORDER_ONLY
 
 # Initialize libtool.