From ed07e3844370927c7452ad68e1cba1dab51bd7ea Mon Sep 17 00:00:00 2001 From: "David J. MacKenzie" Date: Mon, 24 Oct 1994 23:01:59 +0000 Subject: [PATCH] handle SCRIPTS and LIBSCRIPTS similar to PROGRAMS --- automake.in | 18 ++++++++++-------- dist-subd-top.am | 6 +++--- dist-subd.am | 8 ++++---- dist.am | 6 +++--- header-vars.am | 2 +- lib/am/header-vars.am | 2 +- libprograms.am | 6 +++--- programs.am | 6 +++--- 8 files changed, 28 insertions(+), 26 deletions(-) diff --git a/automake.in b/automake.in index c2732f5b..91d199e5 100755 --- a/automake.in +++ b/automake.in @@ -76,7 +76,7 @@ do cat $AM_DIR/header.am >&5 DEFS= INCLUDES= CPPFLAGS= CFLAGS= - SOURCES= CONFIG_HEADER= SUBDIRS= PROGRAMS= LIBPROGRAMS= + SOURCES= CONFIG_HEADER= SUBDIRS= PROGRAMS= LIBPROGRAMS= SCRIPTS= LIBSCRIPTS= LIBRARIES= TEXINFOS= MANS= eval `sed -n -f $am_rmnl ${am_makefile}.am | sed -n -f $am_ass` @@ -121,17 +121,19 @@ ${am_file}_OBJECTS = ${am_file}.${kr}o" >&4 done fi - if test -n "$PROGRAMS$LIBPROGRAMS"; then - if test -n "$PROGRAMS"; then + if test -n "$PROGRAMS$LIBPROGRAMS$SCRIPTS$LIBSCRIPTS"; then + if test -n "$PROGRAMS$SCRIPTS"; then cat $AM_DIR/programs.am >&5 fi - if test -n "$LIBPROGRAMS"; then + if test -n "$LIBPROGRAMS$LIBSCRIPTS"; then cat $AM_DIR/libprograms.am >&5 fi - for am_prog in $PROGRAMS $LIBPROGRAMS; do - eval "test \"\$target_$am_prog\" != explicit" && - sed "s/@PROGRAM@/$am_prog/g" $AM_DIR/program.am >&5 - done + if test -n "$PROGRAMS$LIBPROGRAMS"; then + for am_prog in $PROGRAMS $LIBPROGRAMS; do + eval "test \"\$target_$am_prog\" != explicit" && + sed "s/@PROGRAM@/$am_prog/g" $AM_DIR/program.am >&5 + done + fi fi if test -n "$LIBRARIES"; then diff --git a/dist-subd-top.am b/dist-subd-top.am index e9116d44..2e2c922d 100644 --- a/dist-subd-top.am +++ b/dist-subd-top.am @@ -1,9 +1,9 @@ -dist: $(DIST_FILES) distname +dist: $(DIST_FILES) $(DIST_DIRS) distname rm -rf `cat distname`; mkdir `cat distname` @for file in $(DIST_FILES); do \ echo linking $$file; \ - ln $(srcdir)/$$file `cat distname` || \ - { echo copying $$file instead; cp -p $(srcdir)/$$file `cat distname`;}; \ + ln $(srcdir)/$$file `cat distname`/$$file || \ + { echo copying $$file instead; cp -p $(srcdir)/$$file `cat distname`/$$file;}; \ done for subdir in $(SUBDIRS); do \ (cd $$subdir; $(MAKE) subdir=$$subdir $@); done diff --git a/dist-subd.am b/dist-subd.am index 50bb14d4..34c4c2c1 100644 --- a/dist-subd.am +++ b/dist-subd.am @@ -1,8 +1,8 @@ -dist: $(DIST_FILES) - mkdir ../`cat ../distname`/$(subdir) +dist: $(DIST_FILES) $(DIST_DIRS) + -mkdir ../`cat ../distname`/$(subdir) @for file in $(DIST_FILES); do \ echo linking $$file; \ - ln $(srcdir)/$$file ../`cat ../distname`/$(subdir) || \ - { echo copying $$file instead; cp -p $(srcdir)/$$file ../`cat ../distname`/$(subdir);}; \ + ln $(srcdir)/$$file ../`cat ../distname`/$(subdir)/$$file || \ + { echo copying $$file instead; cp -p $(srcdir)/$$file ../`cat ../distname`/$(subdir)/$$file;}; \ done diff --git a/dist.am b/dist.am index e497379f..24721b8c 100644 --- a/dist.am +++ b/dist.am @@ -1,9 +1,9 @@ -dist: $(DIST_FILES) distname +dist: $(DIST_FILES) $(DIST_DIRS) distname rm -rf `cat distname`; mkdir `cat distname` @for file in $(DIST_FILES); do \ echo linking $$file; \ - ln $(srcdir)/$$file `cat distname` || \ - { echo copying $$file instead; cp -p $(srcdir)/$$file `cat distname`;}; \ + ln $(srcdir)/$$file `cat distname`/$$file || \ + { echo copying $$file instead; cp -p $(srcdir)/$$file `cat distname`/$$file;}; \ done chmod -R a+r `cat distname` tar -chozf `cat distname`.tar.gz `cat distname` diff --git a/header-vars.am b/header-vars.am index 29114122..171dac52 100644 --- a/header-vars.am +++ b/header-vars.am @@ -41,4 +41,4 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ transform = @program_transform_name@ -ALL = ${PROGRAMS} ${LIBPROGRAMS} ${LIBFILES} +ALL = ${PROGRAMS} ${LIBPROGRAMS} ${SCRIPTS} ${LIBSCRIPTS} ${LIBFILES} diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index 29114122..171dac52 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -41,4 +41,4 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ transform = @program_transform_name@ -ALL = ${PROGRAMS} ${LIBPROGRAMS} ${LIBFILES} +ALL = ${PROGRAMS} ${LIBPROGRAMS} ${SCRIPTS} ${LIBSCRIPTS} ${LIBFILES} diff --git a/libprograms.am b/libprograms.am index 8da8a711..77d42c3b 100644 --- a/libprograms.am +++ b/libprograms.am @@ -1,15 +1,15 @@ install:: install-libprograms -install-libprograms: $(LIBPROGRAMS) +install-libprograms: $(LIBPROGRAMS) $(LIBSCRIPTS) $(top_srcdir)/mkinstalldirs $(libexecdir) - for p in $(LIBPROGRAMS); do \ + for p in $(LIBPROGRAMS) $(LIBSCRIPTS); do \ $(INSTALL_PROGRAM) $$p $(libexecdir)/`echo $$p|sed '$(transform)'`; \ done uninstall:: uninstall-libprograms uninstall-libprograms: - for p in $(LIBPROGRAMS); do \ + for p in $(LIBPROGRAMS) $(LIBSCRIPTS); do \ rm -f $(libexecdir)/`echo $$p|sed '$(transform)'`; \ done diff --git a/programs.am b/programs.am index fe527806..e97024fe 100644 --- a/programs.am +++ b/programs.am @@ -1,15 +1,15 @@ install:: install-programs -install-programs: $(PROGRAMS) +install-programs: $(PROGRAMS) $(SCRIPTS) $(top_srcdir)/mkinstalldirs $(bindir) - for p in $(PROGRAMS); do \ + for p in $(PROGRAMS) $(SCRIPTS); do \ $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ done uninstall:: uninstall-programs uninstall-programs: - for p in $(PROGRAMS); do \ + for p in $(PROGRAMS) $(SCRIPTS); do \ rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ done -- 2.43.5