diff options
author | Martin Willi <martin@revosec.ch> | 2013-04-10 15:35:55 +0200 |
---|---|---|
committer | Martin Willi <martin@revosec.ch> | 2013-05-06 15:04:56 +0200 |
commit | 0be946dce3ec58b63f4d5ae33180a82a6f9b64a7 (patch) | |
tree | bd4b2d984329b3df90645ac82a8fd3afc47ee3c4 | |
parent | f932677f0c77b5d31b035166f0893e63483b1185 (diff) | |
download | strongswan-0be946dce3ec58b63f4d5ae33180a82a6f9b64a7.tar.bz2 strongswan-0be946dce3ec58b63f4d5ae33180a82a6f9b64a7.tar.xz |
Use the GEN silent rule when generating files with sed
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | init/systemd/Makefile.am | 1 | ||||
-rw-r--r-- | man/Makefile.am | 2 | ||||
-rw-r--r-- | src/_updown/Makefile.am | 1 | ||||
-rw-r--r-- | src/frontends/gnome/Makefile.am | 1 | ||||
-rw-r--r-- | src/ipsec/Makefile.am | 2 | ||||
-rw-r--r-- | src/libcharon/plugins/maemo/Makefile.am | 2 |
7 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 8a558c150..3cd798648 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 bdbf502e4..e4b7166d6 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 ea04303bd..0becd24c7 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 116322e1e..b6a81f547 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 fb29085a6..118471177 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 8be28eff8..73427c0fa 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 0bf7fad5d..74a019af7 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) - |