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@'. --- src/local.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/local.mk') diff --git a/src/local.mk b/src/local.mk index df09f0241..e127c7497 100644 --- a/src/local.mk +++ b/src/local.mk @@ -29,12 +29,13 @@ EXTRA_PROGRAMS = \ $(build_if_possible__progs) \ $(default__progs) -bin_PROGRAMS = $(OPTIONAL_BIN_PROGS) +# The user can tweak these lists at configure time. +bin_PROGRAMS = @bin_PROGRAMS@ +pkglibexec_PROGRAMS = @pkglibexec_PROGRAMS@ +# Needed by the testsuite. noinst_PROGRAMS = src/setuidgid src/getlimits -pkglibexec_PROGRAMS = $(OPTIONAL_PKGLIB_PROGS) - noinst_HEADERS = \ src/chown-core.h \ src/copy.h \ -- cgit v1.2.3-54-g00ecf