From 891b87b748750320248edb38dbe310a69dc8589f Mon Sep 17 00:00:00 2001
From: Krisztian Litkey <krisztian.litkey@intel.com>
Date: Sat, 21 Apr 2012 12:46:08 +0300
Subject: [PATCH] build: shave linker script generation.

---
 build-aux/gen-linker-script   | 5 ++++-
 src/Makefile.am               | 5 +++--
 src/murphy-db/mdb/Makefile.am | 4 +++-
 src/murphy-db/mqi/Makefile.am | 4 +++-
 src/murphy-db/mql/Makefile.am | 4 +++-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/build-aux/gen-linker-script b/build-aux/gen-linker-script
index e314c15..7c8b3ad 100755
--- a/build-aux/gen-linker-script
+++ b/build-aux/gen-linker-script
@@ -57,6 +57,9 @@ while [ -n "${1#-}" ]; do
         -h)
             usage 0
             ;;
+	-q)
+	    QUIET="yes"
+	    ;;
         -*)
             error "Unknown option '$1'."
             usage
@@ -90,7 +93,7 @@ else
 fi
 
 # generate the output
-info "Generating linker script $OUTPUT..."
+[ -n "$QUIET" ] || info "Generating linker script $OUTPUT..."
 rm -f $OUTPUT
 touch $OUTPUT
 
diff --git a/src/Makefile.am b/src/Makefile.am
index ae613a9..5c3b4e4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,6 +8,7 @@ lib_LTLIBRARIES =
 pkgconfig_DATA  =
 EXTRA_DIST      =
 
+QUIET_GEN       = $(Q:@=@echo '  GEN   '$@;)
 
 ###################################
 # murphy common library
@@ -62,7 +63,7 @@ libcommoninclude_HEADERS = $(libmurphy_common_la_HEADERS)
 
 # linker script generation
 linker-script.common: $(libmurphy_common_la_HEADERS)
-	$(top_builddir)/build-aux/gen-linker-script -o $@ $^
+	$(QUIET_GEN)$(top_builddir)/build-aux/gen-linker-script -q -o $@ $^
 
 clean-linker-script::
 	-rm -f linker-script.common
@@ -106,7 +107,7 @@ libmurphy_core_la_DEPENDENCIES = linker-script.core
 
 # core linker script generation
 linker-script.core: $(libmurphy_core_la_HEADERS)
-	$(top_builddir)/build-aux/gen-linker-script -o $@ $^
+	$(QUIET_GEN)$(top_builddir)/build-aux/gen-linker-script -q -o $@ $^
 
 clean-linker-script::
 	-rm -f linker-script.core
diff --git a/src/murphy-db/mdb/Makefile.am b/src/murphy-db/mdb/Makefile.am
index 2f98437..8f75a34 100644
--- a/src/murphy-db/mdb/Makefile.am
+++ b/src/murphy-db/mdb/Makefile.am
@@ -1,6 +1,7 @@
 pkglib_LTLIBRARIES = libmdb.la
 
 LINKER_SCRIPT = linker-script.mdb
+QUIET_GEN     = $(Q:@=@echo '  GEN   '$@;)
 
 libmdb_la_CFLAGS = -I../include
 
@@ -36,7 +37,8 @@ libmdb_la_DEPENDENCIES = $(LINKER_SCRIPT)
 
 # linker script generation
 $(LINKER_SCRIPT): $(libmdb_la_HEADERS)
-	$(top_builddir)/build-aux/gen-linker-script -p "^(mdb_)|(mqi_)" -o $@ $^
+	$(QUIET_GEN)$(top_builddir)/build-aux/gen-linker-script -q \
+	    -p "^(mdb_)|(mqi_)" -o $@ $^
 
 clean-$(LINKER_SCRIPT):
 	-rm -f $(LINKER_SCRIPT)
diff --git a/src/murphy-db/mqi/Makefile.am b/src/murphy-db/mqi/Makefile.am
index 7486491..906fd2c 100644
--- a/src/murphy-db/mqi/Makefile.am
+++ b/src/murphy-db/mqi/Makefile.am
@@ -1,6 +1,7 @@
 pkglib_LTLIBRARIES = libmqi.la
 
 LINKER_SCRIPT = linker-script.mqi
+QUIET_GEN     = $(Q:@=@echo '  GEN   '$@;)
 
 libmqi_la_CFLAGS = -I../include
 
@@ -22,7 +23,8 @@ libmqi_la_DEPENDENCIES = $(LINKER_SCRIPT)
 
 # linker script generation
 $(LINKER_SCRIPT): $(libmqi_la_HEADERS)
-	$(top_builddir)/build-aux/gen-linker-script -p "^mqi_" -o $@ $^
+	$(QUIET_GEN)$(top_builddir)/build-aux/gen-linker-script -q \
+	    -p "^mqi_" -o $@ $^
 
 clean-$(LINKER_SCRIPT):
 	-rm -f $(LINKER_SCRIPT)
diff --git a/src/murphy-db/mql/Makefile.am b/src/murphy-db/mql/Makefile.am
index d050678..46e2cc3 100644
--- a/src/murphy-db/mql/Makefile.am
+++ b/src/murphy-db/mql/Makefile.am
@@ -5,6 +5,7 @@ AM_YFLAGS       = -p $(PARSER_PREFIX)
 LEX_OUTPUT_ROOT = ./lex.$(PARSER_PREFIX)
 
 LINKER_SCRIPT = linker-script.mql
+QUIET_GEN     = $(Q:@=@echo '  GEN   '$@;)
 
 libmql_la_CFLAGS = -I../include
 
@@ -46,7 +47,8 @@ clean-scanner:
 
 # linker script generation
 $(LINKER_SCRIPT): $(libmql_la_HEADERS)
-	$(top_builddir)/build-aux/gen-linker-script -p "^mql_" -o $@ $^
+	$(QUIET_GEN)$(top_builddir)/build-aux/gen-linker-script -q \
+	    -p "^mql_" -o $@ $^
 
 clean-$(LINKER_SCRIPT):
 	-rm -f $(LINKER_SCRIPT)
-- 
2.7.4