From 380d9da0b01c86aa11a7e83279fe7baebed6aad7 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sat, 1 Sep 2012 01:46:47 +0200 Subject: build: simplify: get rid of some indirection variables The code deciding which coreutils programs to build (depending on defaults, system capabilities, and user requests) is overly complex and rather confusing. Let's begin simplifying it by removing some non-strictly-necessary indirection variables. * configure.ac: Adjust and improve few comments. (OPTIONAL_BIN_PROGS, OPTIONAL_PKGLIB_PROGS): Rename ... (bin_PROGRAMS, pkglibexec_PROGRAMS): ... like these, respectively. Ensure they aren't initialized in all Makefiles (which would lead to spurious errors), by calling AM_SUBST_NOTMAKE on them. * src/local.mk: Adjust and improve few comments. (bin_PROGRAMS, pkglibexec_PROGRAMS): Simply define to the corresponding '@substitution@'. --- configure.ac | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index f169a44a9..bfc5219a4 100644 --- a/configure.ac +++ b/configure.ac @@ -440,22 +440,25 @@ MAN=` done` NO_INSTALL_PROGS_DEFAULT=$no_install_progs_default -OPTIONAL_PKGLIB_PROGS=` - for p in $optional_pkglib_progs; do echo src/$p; done` + +# The programs built and installed by "make && make install". # Since this is AC_SUBST'd, Automake won't be able to perform rewrite -# with $(EXEEXT) appending on it, so we have to do it ourselves. -OPTIONAL_BIN_PROGS=` +# with $(EXEEXT) appending on it, so we have to do it ourselves -- in +# this case, only for $(bin_PROGRAMS). +bin_PROGRAMS=` for p in $optional_bin_progs; do echo "src/$p\$(EXEEXT)"; done` +pkglibexec_PROGRAMS=` + for p in $optional_pkglib_progs; do echo src/$p; done` # Normalize whitespace. MAN=`echo $MAN` NO_INSTALL_PROGS_DEFAULT=`echo $NO_INSTALL_PROGS_DEFAULT` -OPTIONAL_BIN_PROGS=`echo $OPTIONAL_BIN_PROGS` -OPTIONAL_PKGLIB_PROGS=`echo $OPTIONAL_PKGLIB_PROGS` +bin_PROGRAMS=`echo $bin_PROGRAMS` +pkglibexec_PROGS=`echo $pkglibexec_PROGRAMS` AC_SUBST([NO_INSTALL_PROGS_DEFAULT]) -AC_SUBST([OPTIONAL_BIN_PROGS]) -AC_SUBST([OPTIONAL_PKGLIB_PROGS]) +AC_SUBST([bin_PROGRAMS]) AM_SUBST_NOTMAKE([bin_PROGRAMS]) +AC_SUBST([pkglibexec_PROGRAMS]) AM_SUBST_NOTMAKE([pkglibexec_PROGRAMS]) AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes]) -- cgit v1.2.3-54-g00ecf