Permalink
Browse files

Enable silent make rules

  • Loading branch information...
1 parent 4676227 commit 3a15bf1f2c91c1225ac9fb1895cfbce904462b92 @nickg committed Sep 24, 2012
Showing with 20 additions and 3 deletions.
  1. +9 −1 configure.ac
  2. +6 −1 lib/ieee/Makefile.am
  3. +5 −1 lib/std/Makefile.am
View
@@ -1,7 +1,8 @@
AC_INIT([nvc], [0.1],
[Nick Gasson <nick@nick.me.uk>],
[nvc])
-AM_INIT_AUTOMAKE([color-tests])
+AM_INIT_AUTOMAKE([1.11 color-tests])
+AM_SILENT_RULES([yes])
AC_CONFIG_MACRO_DIR([m4])
@@ -76,6 +77,13 @@ esac
AC_DEFINE_UNQUOTED([SYSTEM_CC], ["$(which $CC)"], [System compiler])
+# Turn on silent make when using the GNU version
+AX_CHECK_GNU_MAKE
+if ! test x$_cv_gnu_make_command = x ; then
+ MAKEFLAGS='$(if $(V),,-s)'
+fi
+AC_SUBST(MAKEFLAGS)
+
AC_CONFIG_HEADERS([config.h])
AC_OUTPUT([Makefile src/Makefile src/rt/Makefile test/Makefile \
lib/Makefile lib/std/Makefile lib/ieee/Makefile \
View
@@ -6,7 +6,12 @@ ieee_DATA = ieee/_NVC_LIB ieee/IEEE.STD_LOGIC_1164 ieee/IEEE.NUMERIC_BIT \
ieee/_IEEE.STD_LOGIC_1164-body.bc ieee/IEEE.NUMERIC_STD-body \
ieee/_IEEE.NUMERIC_STD-body.bc
-lib = NVC_LIBPATH=../std
+# XXX: add -L argument and move $(nvc_verbose) to $(nvc)
+lib = $(nvc_verbose) NVC_LIBPATH=../std
+
+nvc_verbose = $(nvc_verbose_@AM_V@)
+nvc_verbose_ = $(nvc_verbose_@AM_DEFAULT_V@)
+nvc_verbose_0 = @echo " NVC " $@;
bootstrap: $(ieee_DATA)
View
@@ -1,8 +1,12 @@
-nvc = $(top_builddir)/src/nvc
+nvc = $(nvc_verbose)$(top_builddir)/src/nvc
stddir = $(pkgdatadir)/std
std_DATA = std/_NVC_LIB std/STD.STANDARD #std/STD.TEXTIO
+nvc_verbose = $(nvc_verbose_@AM_V@)
+nvc_verbose_ = $(nvc_verbose_@AM_DEFAULT_V@)
+nvc_verbose_0 = @echo " NVC " $@;
+
bootstrap: $(std_DATA)
std/_NVC_LIB: std/STD.STANDARD

0 comments on commit 3a15bf1

Please sign in to comment.