Merge branch 'silent-automake'
Adds support for --enable/disable-silent-rules when building with Automake 1.11 or 1.12. make V=0 or V=1 can be used to build with a different verbosity than ./configured.
This commit is contained in:
Martin Willi
commit
e9b3bd5434
|
|
@ -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):" \
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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):" \
|
||||
|
|
|
|||
|
|
@ -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 > $@
|
||||
|
||||
|
|
|
|||
|
|
@ -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):" \
|
||||
|
|
|
|||
|
|
@ -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)|' $< >$@
|
||||
|
||||
|
|
|
|||
|
|
@ -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):" \
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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 > $@
|
||||
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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 > $@
|
||||
|
|
|
|||
Loading…
Reference in New Issue