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

diff --git a/Makefile.am b/Makefile.am
index 4ad829127af3472aeadfef2bc57676cb552503aa..b2c307e7011ccb6b08d5cf348ab676cd17194dae 100644 (file)
--- 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 31efdac5b3d7bd9553c940437b001874ce9ac872..836048947f3a235e161fcf940c6e4a70191fbdd3 100644 (file)
--- 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.