From: Martin Willi <martin@revosec.ch>
Date: Wed, 10 Apr 2013 13:35:55 +0000 (+0200)
Subject: Use the GEN silent rule when generating files with sed
X-Git-Tag: 5.1.0dr1~156^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0be946dce3ec58b63f4d5ae33180a82a6f9b64a7;p=thirdparty%2Fstrongswan.git

Use the GEN silent rule when generating files with sed
---

diff --git a/Makefile.am b/Makefile.am
index 8a558c1507..3cd798648b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,11 +17,13 @@ nodist_config_include_HEADERS = config.h
 endif
 
 Android.common.mk :	Android.common.mk.in configure.in
+		$(AM_V_GEN) \
 		sed \
 		-e "s:\@PACKAGE_VERSION\@:$(PACKAGE_VERSION):" \
 		$(srcdir)/$@.in > $@
 
 Doxyfile :	Doxyfile.in
+		$(AM_V_GEN) \
 		sed \
 		-e "s:\@PACKAGE_VERSION\@:$(PACKAGE_VERSION):" \
 		-e "s:\@PACKAGE_NAME\@:$(PACKAGE_NAME):" \
diff --git a/init/systemd/Makefile.am b/init/systemd/Makefile.am
index bdbf502e4e..e4b7166d66 100644
--- a/init/systemd/Makefile.am
+++ b/init/systemd/Makefile.am
@@ -5,6 +5,7 @@ CLEANFILES = strongswan.service
 systemdsystemunit_DATA = strongswan.service
 
 strongswan.service : strongswan.service.in
+	$(AM_V_GEN) \
 	sed \
 	-e "s:@SBINDIR@:$(sbindir):" \
 	-e "s:@IPSEC_SCRIPT@:$(ipsec_script):" \
diff --git a/man/Makefile.am b/man/Makefile.am
index ea04303bda..0becd24c7c 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -5,9 +5,9 @@ CLEANFILES = ipsec.conf.5 ipsec.secrets.5 strongswan.conf.5
 SUFFIXES = .in
 
 .in:
+	$(AM_V_GEN) \
 	sed \
 	-e "s:@IPSEC_VERSION@:$(PACKAGE_VERSION):" \
 	-e "s:@DEV_URANDOM@:$(urandom_device):" \
 	-e "s:@DEV_RANDOM@:$(random_device):" \
 	$(srcdir)/$@.in > $@
-
diff --git a/src/_updown/Makefile.am b/src/_updown/Makefile.am
index 116322e1ef..b6a81f547d 100644
--- a/src/_updown/Makefile.am
+++ b/src/_updown/Makefile.am
@@ -4,6 +4,7 @@ dist_man8_MANS = _updown.8
 EXTRA_DIST = _updown.in
 
 _updown : _updown.in
+	$(AM_V_GEN) \
 	sed \
 	-e "s:\@sbindir\@:$(sbindir):" \
 	-e "s:\@routing_table\@:$(routing_table):" \
diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am
index fb29085a65..1184711770 100644
--- a/src/frontends/gnome/Makefile.am
+++ b/src/frontends/gnome/Makefile.am
@@ -11,6 +11,7 @@ nmvpnservice_DATA = nm-strongswan-service.name
 @INTLTOOL_DESKTOP_RULE@
 
 nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in
+	$(AM_V_GEN) \
 	sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|' \
 	    -e 's|[@]CHARON[@]|$(charon)|' $< >$@
 
diff --git a/src/ipsec/Makefile.am b/src/ipsec/Makefile.am
index 8be28eff8c..73427c0fae 100644
--- a/src/ipsec/Makefile.am
+++ b/src/ipsec/Makefile.am
@@ -4,6 +4,7 @@ dist_man8_MANS = _ipsec.8
 EXTRA_DIST = _ipsec.in _ipsec.8.in Android.mk
 
 _ipsec.8 : _ipsec.8.in
+	$(AM_V_GEN) \
 	sed \
 	-e "s:@IPSEC_VERSION@:$(PACKAGE_VERSION):" \
 	-e "s:@IPSEC_SCRIPT@:$(ipsec_script):g" \
@@ -11,6 +12,7 @@ _ipsec.8 : _ipsec.8.in
 	$(srcdir)/$@.in > $@
 
 _ipsec : _ipsec.in
+	$(AM_V_GEN) \
 	sed \
 	-e "s:@IPSEC_SHELL@:/bin/sh:" \
 	-e "s:@IPSEC_VERSION@:$(PACKAGE_VERSION):" \
diff --git a/src/libcharon/plugins/maemo/Makefile.am b/src/libcharon/plugins/maemo/Makefile.am
index 0bf7fad5dc..74a019af79 100644
--- a/src/libcharon/plugins/maemo/Makefile.am
+++ b/src/libcharon/plugins/maemo/Makefile.am
@@ -20,8 +20,8 @@ libstrongswan_maemo_la_LIBADD  = ${maemo_LIBS}
 dbusservice_DATA = org.strongswan.charon.service
 
 org.strongswan.charon.service: $(srcdir)/org.strongswan.charon.service.in
+	$(AM_V_GEN) \
 	sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|' $< >$@
 
 EXTRA_DIST = org.strongswan.charon.service.in
 CLEANFILES = $(dbusservice_DATA)
-