summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
644cde0)
* Introduce a new macro mdw_SILENT_RULES which enables the use of
the `silent-rules' feature if it's available. If the feature is
/not/ available, then make sure that AM_DEFAULT_VERBOSITY is
defined, in order to avoid errors about recursive variable-expansion
in custom silent-rules actions.
* Use this machinery to implement `silent-rules' building in the
package itself.
confsubst = $(srcdir)/confsubst.in
mkdir_p = $(srcdir)/config/install-sh -d
confsubst = $(srcdir)/confsubst.in
mkdir_p = $(srcdir)/config/install-sh -d
+V_SUBST = $(V_SUBST_$(V))
+V_SUBST_ = $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
+V_SUBST_0 = @echo " SUBST $@";
+SUBST = $(V_SUBST)$(confsubst)
+
###--------------------------------------------------------------------------
### Main scripts.
###--------------------------------------------------------------------------
### Main scripts.
EXTRA_DIST += mklinks.in
mklinks: mklinks.in Makefile
EXTRA_DIST += mklinks.in
mklinks: mklinks.in Makefile
- $(confsubst) $(srcdir)/mklinks.in >$@.new \
+ $(SUBST) $(srcdir)/mklinks.in >$@.new \
pkgdatadir=$(pkgdatadir) VERSION=$(VERSION)
pkgdatadir=$(pkgdatadir) VERSION=$(VERSION)
- chmod +x $@.new
- mv $@.new $@
+ $(AM_V_at)chmod +x $@.new
+ $(AM_V_at)mv $@.new $@
## findlinks
bin_SCRIPTS += findlinks
## findlinks
bin_SCRIPTS += findlinks
EXTRA_DIST += findlinks.in
findlinks: findlinks.in Makefile
EXTRA_DIST += findlinks.in
findlinks: findlinks.in Makefile
- $(confsubst) $(srcdir)/findlinks.in >$@.new \
+ $(SUBST) $(srcdir)/findlinks.in >$@.new \
pkgdatadir=$(pkgdatadir) VERSION=$(VERSION)
pkgdatadir=$(pkgdatadir) VERSION=$(VERSION)
- chmod +x $@.new
- mv $@.new $@
+ $(AM_V_at)chmod +x $@.new
+ $(AM_V_at)mv $@.new $@
## mdw-setup
bin_SCRIPTS += mdw-setup
## mdw-setup
bin_SCRIPTS += mdw-setup
EXTRA_DIST += confsubst.in
confsubst: confsubst.in Makefile
EXTRA_DIST += confsubst.in
confsubst: confsubst.in Makefile
- $(confsubst) $(srcdir)/confsubst.in >$@.new \
- VERSION=$(VERSION)
- chmod +x $@.new
- mv $@.new $@
+ $(SUBST) $(srcdir)/confsubst.in >$@.new VERSION=$(VERSION)
+ $(AM_V_at)chmod +x $@.new
+ $(AM_V_at)mv $@.new $@
## auto-version
pkgdata_SCRIPTS += auto-version
## auto-version
pkgdata_SCRIPTS += auto-version
EXTRA_DIST += auto-version.in
auto-version: auto-version.in Makefile
EXTRA_DIST += auto-version.in
auto-version: auto-version.in Makefile
- $(confsubst) $(srcdir)/auto-version.in >$@.new \
- VERSION=$(VERSION)
- chmod +x $@.new
- mv $@.new $@
+ $(SUBST) $(srcdir)/auto-version.in >$@.new VERSION=$(VERSION)
+ $(AM_V_at)chmod +x $@.new
+ $(AM_V_at)mv $@.new $@
## Testsuites.
pkgdata_DATA += autotest.am
## Testsuites.
pkgdata_DATA += autotest.am
AC_SUBST([LIBTOOL_VERSION_INFO])
])
AC_SUBST([LIBTOOL_VERSION_INFO])
])
+dnl --- *@-mdw_SILENT_RULES-@* ---
+dnl
+dnl Author: Mark Wooding
+dnl
+dnl Synopsis: mdw_SILENT_RULES
+dnl
+dnl Arguments: ---
+dnl
+dnl Use: Enables the Automake `silent-rules' feature, if available.
+
+AC_DEFUN([mdw_SILENT_RULES], [
+ m4_ifdef([AM_SILENT_RULES], [
+ AM_SILENT_RULES([yes])
+ ], [
+ AC_SUBST([AM_DEFAULT_VERBOSITY], [1])
+ ])
+])
+
dnl --- *@-mdw_DECL_ENVIRON-@* ---
dnl
dnl Author: Mark Wooding
dnl --- *@-mdw_DECL_ENVIRON-@* ---
dnl
dnl Author: Mark Wooding
EXTRA_DIST += testsuite.at testsuite $(autotest_TESTS)
$(srcdir)/testsuite: $(TESTDEPS)
EXTRA_DIST += testsuite.at testsuite $(autotest_TESTS)
$(srcdir)/testsuite: $(TESTDEPS)
- $(AUTOM4TE) --language=autotest \
+ $(AM_V_GEN)$(AUTOM4TE) --language=autotest \
-I$(srcdir) $@.at -o $@.new && mv $@.new $@
clean-local: clean-testsuite-dir
-I$(srcdir) $@.at -o $@.new && mv $@.new $@
clean-local: clean-testsuite-dir
CLEANFILES += run-tests
run-tests: Makefile $(srcdir)/testsuite
CLEANFILES += run-tests
run-tests: Makefile $(srcdir)/testsuite
{ echo '#! /bin/sh'; \
echo 'exec $(SHELL) $(srcdir)/testsuite "$$@"'; \
} >$@.new && chmod +x $@.new && mv $@.new $@
{ echo '#! /bin/sh'; \
echo 'exec $(SHELL) $(srcdir)/testsuite "$$@"'; \
} >$@.new && chmod +x $@.new && mv $@.new $@
EXTRA_DIST += tests.m4
$(srcdir)/tests.m4: Makefile.in
EXTRA_DIST += tests.m4
$(srcdir)/tests.m4: Makefile.in
for i in $(all_autotest_TESTS); do \
echo $$i | sed \
-e 's:^$(top_srcdir):$(top_builddir):' \
for i in $(all_autotest_TESTS); do \
echo $$i | sed \
-e 's:^$(top_srcdir):$(top_builddir):' \
EXTRA_DIST += package.m4
$(srcdir)/package.m4: $(top_srcdir)/configure.ac
EXTRA_DIST += package.m4
$(srcdir)/package.m4: $(top_srcdir)/configure.ac
{ echo '### package information'; \
echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \
echo 'm4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \
{ echo '### package information'; \
echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \
echo 'm4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \
AC_CONFIG_SRCDIR([mdw-setup])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR([mdw-setup])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([foreign])
dnl--------------------------------------------------------------------------
dnl Finding installation directories.
dnl--------------------------------------------------------------------------
dnl Finding installation directories.