diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.in | 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 | ||||
| -rw-r--r-- | src/libstrongswan/Makefile.am | 3 | ||||
| -rw-r--r-- | src/libstrongswan/asn1/oid.pl | 2 | ||||
| -rw-r--r-- | src/starter/Makefile.am | 2 | ||||
| -rw-r--r-- | src/stroke/Makefile.am | 1 |
12 files changed, 20 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 8a558c150..1fc1fcdb3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,10 @@ if USE_SCRIPTS SUBDIRS += scripts endif +if USE_SILENT_RULES + AM_MAKEFLAGS = -s +endif + ACLOCAL_AMFLAGS = -I m4/config EXTRA_DIST = Doxyfile.in LICENSE Android.common.mk.in Android.common.mk Android.mk @@ -17,11 +21,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/configure.in b/configure.in index 9a00b6256..f0a2ec961 100644 --- a/configure.in +++ b/configure.in @@ -21,6 +21,7 @@ AC_INIT([strongSwan],[5.0.4]) AM_INIT_AUTOMAKE(tar-ustar) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AC_CONFIG_MACRO_DIR([m4/config]) AC_CONFIG_HEADERS([config.h]) AC_DEFINE([CONFIG_H_INCLUDED], [], [defined if config.h included]) @@ -1217,6 +1218,7 @@ AM_CONDITIONAL(USE_IMCV, test x$imcv = xtrue) AM_CONDITIONAL(USE_PTS, test x$pts = xtrue) AM_CONDITIONAL(USE_TROUSERS, test x$tss = xtrousers) AM_CONDITIONAL(MONOLITHIC, test x$monolithic = xtrue) +AM_CONDITIONAL(USE_SILENT_RULES, test x$enable_silent_rules = xyes) AM_CONDITIONAL(UNITTESTS, test x$unit_tests = xtrue) AM_CONDITIONAL(USE_TKM, test x$tkm = xtrue) 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) - diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index 8d6c4583a..81e271a8a 100644 --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am @@ -124,13 +124,16 @@ $(srcdir)/asn1/oid.c $(srcdir)/asn1/oid.h \ $(srcdir)/crypto/proposal/proposal_keywords_static.c $(srcdir)/asn1/oid.c : $(srcdir)/asn1/oid.pl $(srcdir)/asn1/oid.txt + $(AM_V_GEN) \ (cd $(srcdir)/asn1/ && $(PERL) oid.pl) $(srcdir)/asn1/oid.h : $(srcdir)/asn1/oid.pl $(srcdir)/asn1/oid.txt + $(AM_V_GEN) \ (cd $(srcdir)/asn1/ && $(PERL) oid.pl) $(srcdir)/crypto/proposal/proposal_keywords_static.c: $(srcdir)/crypto/proposal/proposal_keywords_static.txt \ $(srcdir)/crypto/proposal/proposal_keywords_static.h + $(AM_V_GEN) \ $(GPERF) -N proposal_get_token_static -m 10 -C -G -c -t -D < \ $(srcdir)/crypto/proposal/proposal_keywords_static.txt > $@ diff --git a/src/libstrongswan/asn1/oid.pl b/src/libstrongswan/asn1/oid.pl index ed26febc9..82100e8aa 100644 --- a/src/libstrongswan/asn1/oid.pl +++ b/src/libstrongswan/asn1/oid.pl @@ -19,8 +19,6 @@ $copyright="Copyright (C) 2003-2008 Andreas Steffen, Hochschule fuer Technik Rap $automatic="This file has been automatically generated by the script oid.pl"; $warning="Do not edit manually!"; -print "oid.pl generating oid.h and oid.c\n"; - # Generate oid.h open(OID_H, ">oid.h") diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am index c220c2e63..2c08db50e 100644 --- a/src/starter/Makefile.am +++ b/src/starter/Makefile.am @@ -42,6 +42,7 @@ if USE_TOOLS endif keywords.c: $(srcdir)/keywords.txt $(srcdir)/keywords.h + $(AM_V_GEN) \ $(GPERF) -m 10 -C -G -D -t < $(srcdir)/keywords.txt > $@ install-exec-local : @@ -55,4 +56,3 @@ install-exec-local : test -e "$(DESTDIR)${sysconfdir}/ipsec.d/reqs" || $(INSTALL) -d "$(DESTDIR)$(sysconfdir)/ipsec.d/reqs" || true test -e "$(DESTDIR)${sysconfdir}/ipsec.d/private" || $(INSTALL) -d -m 750 "$(DESTDIR)$(sysconfdir)/ipsec.d/private" || true test -e "$(DESTDIR)$(sysconfdir)/ipsec.conf" || $(INSTALL) -m 644 $(srcdir)/ipsec.conf $(DESTDIR)$(sysconfdir)/ipsec.conf || true - diff --git a/src/stroke/Makefile.am b/src/stroke/Makefile.am index f93680b64..2d2d05748 100644 --- a/src/stroke/Makefile.am +++ b/src/stroke/Makefile.am @@ -11,4 +11,5 @@ MAINTAINERCLEANFILES = stroke_keywords.c AM_CFLAGS = -DIPSEC_PIDDIR=\"${piddir}\" stroke_keywords.c: $(srcdir)/stroke_keywords.txt $(srcdir)/stroke_keywords.h + $(AM_V_GEN) \ $(GPERF) -m 10 -D -C -G -t < $(srcdir)/stroke_keywords.txt > $@ |