From 082e8ce72ad20442d61a14f2ce1d2e93acd4250e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 16 Nov 1995 07:09:24 +0000 Subject: [PATCH] Use AM_PROGRAMS, not ALLPROGRAMS, and invert sense. --- automake.in | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/automake.in b/automake.in index 322c782..628b424 100755 --- a/automake.in +++ b/automake.in @@ -127,12 +127,12 @@ do DEFS= INCLUDES= CPPFLAGS= CFLAGS= SOURCES= CONFIG_HEADER= SUBDIRS= PROGRAMS= LIBPROGRAMS= SCRIPTS= LIBSCRIPTS= - LIBRARIES= TEXINFOS= MANS= ALLPROGRAMS= + LIBRARIES= TEXINFOS= MANS= AM_PROGRAMS= eval `sed -n -f $am_rmnl ${am_makefile}.am | sed -n -f $am_ass` - test -n "$ALLPROGRAMS" || { - echo "ALLPROGRAMS = $PROGRAMS" >&4 + test -n "$AM_PROGRAMS" || { + AM_PROGRAMS=$PROGRAMS } if grep @kr@ ${am_makefile}.am >/dev/null; then @@ -141,11 +141,11 @@ do kr= fi - if test -n "$PROGRAMS$LIBPROGRAMS$LIBRARIES"; then + if test -n "$AM_PROGRAMS$LIBPROGRAMS$LIBRARIES"; then cat $AM_DIR/compile-vars.am >&4 cat $AM_DIR/compile.am >&5 grep @kr@ ${am_makefile}.am >/dev/null && cat $AM_DIR/compile-kr.am >&5 - for am_file in $PROGRAMS $LIBPROGRAMS $LIBRARIES; do + for am_file in $AM_PROGRAMS $LIBPROGRAMS $LIBRARIES; do if grep "^[ ]*${am_file}_SOURCES[ ]*=" ${am_makefile}.am >/dev/null; then if grep "^[ ]*${am_file}_OBJECTS[ ]*=" ${am_makefile}.am >/dev/null; then : @@ -175,15 +175,15 @@ ${am_file}_OBJECTS = ${am_file}.${kr}o" >&4 done fi - if test -n "$PROGRAMS$LIBPROGRAMS$SCRIPTS$LIBSCRIPTS"; then - if test -n "$PROGRAMS$SCRIPTS"; then + if test -n "$AM_PROGRAMS$LIBPROGRAMS$SCRIPTS$LIBSCRIPTS"; then + if test -n "$AM_PROGRAMS$SCRIPTS"; then cat $AM_DIR/programs.am >&5 fi if test -n "$LIBPROGRAMS$LIBSCRIPTS"; then cat $AM_DIR/libprograms.am >&5 fi - if test -n "$PROGRAMS$LIBPROGRAMS"; then - for am_prog in $PROGRAMS $LIBPROGRAMS; do + if test -n "$AM_PROGRAMS$LIBPROGRAMS"; then + for am_prog in $AM_PROGRAMS $LIBPROGRAMS; do eval "test \"\$target_$am_prog\" != explicit" && sed "s/@PROGRAM@/$am_prog/g" $AM_DIR/program.am >&5 done -- 2.7.4