.

diff --git a/lib/Makefile.in b/lib/Makefile.in
index f1e6286e4df0bb0600f60dfe5d02ee0bbeb89c17..79644d61d92b6d63cfa1c751f97b2149cb08070e 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -156,7 +156,7 @@ target_alias = @target_alias@
 
 noinst_LIBRARIES = libfetish.a
 
-INCLUDES = -I.. -I$(srcdir)
+AM_CPPFLAGS = -I.. -I$(srcdir)
 
 libfetish_a_SOURCES = \
   acl.h acl.c \

diff --git a/src/Makefile.in b/src/Makefile.in
index 2c8f3f56489a6688ef539cf7f04bf9f41eca2a05..565a9389bfb0bbb4b264b1870c4baec0a388daa0 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -182,7 +182,7 @@ EXTRA_DIST = dcgen dircolors.hin tac-pipe.c \
 
 CLEANFILES = $(SCRIPTS) su
 
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../lib
+AM_CPPFLAGS = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../lib
 
 # Sometimes, the expansion of $(LIBINTL) includes -lc which may
 # include modules defining variables like `optind', so libfetish.a
@@ -866,7 +866,7 @@ uninstall-binPROGRAMS:
        done
 
 clean-binPROGRAMS:
-       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) > /dev/null 2>&1 || /bin/rm -f $(bin_PROGRAMS)
+       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 
 installcheck-binPROGRAMS: $(bin_PROGRAMS)
        bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index efd580a419f321cb34f331706668a79767a99106..f7f286145f7d58d2a84277a86edaa5d65f96d139 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -151,9 +151,15 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 
+all_programs = \
+  echo 'spy:;@echo $$(all_programs)'                                   \
+    | MAKEFLAGS= $(MAKE) -s -C $(srcdir)/../src -f Makefile -f - spy   \
+    | fmt -1 | sort -u
+
+
 TESTS = help-version
 TESTS_ENVIRONMENT = \
-  all_programs="$(bin_SCRIPTS) $(bin_PROGRAMS)"
+  all_programs="`$(all_programs)`"
 
 
 EXTRA_DIST = \