From 3038064b644d5aed9bc7d87810670110ed2335d4 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 25 Aug 1997 23:25:10 +0000 Subject: [PATCH] merged changes from Cygnus --- ChangeLog | 69 +++++++++++++++++++++++++++++++++ automake.in | 107 ++++++++++++++++++++++++++++++++++++++++++--------- lib/am/program.am | 15 ++------ lib/am/progs.am | 10 ++--- lib/am/remake-hdr.am | 2 +- lib/am/texinfos.am | 4 +- m4/Makefile.am | 2 +- m4/Makefile.in | 5 +-- m4/cygwin.m4 | 36 ++++++----------- m4/exeext.m4 | 29 ++++++++++++++ program.am | 15 ++------ progs-clean.am | 7 +--- progs.am | 10 ++--- remake-hdr.am | 2 +- tests/ChangeLog | 4 ++ tests/cygwin32.test | 2 +- texinfos.am | 4 +- 17 files changed, 229 insertions(+), 94 deletions(-) rewrite m4/cygwin.m4 (75%) create mode 100644 m4/exeext.m4 diff --git a/ChangeLog b/ChangeLog index ff8ce90dd..d29e01f55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,6 +86,75 @@ Thu Jul 24 00:52:02 1997 Tom Tromey * automake.in (handle_emacs_lisp): Put contents of lisp-clean.am into output. Report from Karl Berry. +Mon Aug 25 16:14:32 1997 Tom Tromey + + * automake.in (handle_configure): Only generate ":" syntax for + CONFIG_FILES when really needed. + +Wed Aug 6 14:47:12 1997 Ian Lance Taylor + + * remake-hdr.am (@CONFIG_HEADER@): Use a dummy command to force + GNU make to recheck the file modification time. + +Tue Aug 5 14:44:10 1997 Ian Lance Taylor + + * ylwrap: If the program is a relative path, force it to be + absolute. + +Mon Aug 4 14:52:08 1997 Ian Lance Taylor + + * automake.in ($RULE_PATTERN): Accept $ in body of rule name. + (handle_programs): Don't append $(EXEEXT) if the + program name contains '.'. + (am_install_var): When rewriting _PROGRAMS, don't append $(EXEEXT) + if the program names contains '.'. Also, handle conditionals. + +Sat Aug 2 14:43:41 1997 Tom Tromey + + * m4/exeext.m4: Fixed quoting. + + * m4/exeext.m4 (am_cv_exeext): Use echo, not ls. + + * automake.in (handle_programs): Transform @EXEEXT@ when including + program.am. + +Fri Aug 1 17:09:09 1997 Tom Tromey + + * automake.in (handle_programs): Don't transform CYGWIN or + NOTCYGWIN. + (am_install_var): Likewise. + + * progs-clean.am (clean-@DIR@PROGRAMS): Never include EXEEXT. + + * progs.am: Removed @EXEEXT@; it is now implicit. + * program.am: Add @EXEEXT@ in appropriate places; removed + cygwin-dependent code. + * automake.in (seen_exeext): Renamed from seen_cygwin32. + (handle_programs): Use seen_exeext. + (scan_one_configure_file): Look for AM_EXEEXT, not AM_CYGWIN32. + (check_cygnus): Use seen_exeext. + (am_install_var): Likewise. + (am_install_var): When handling PROGRAMS primary, append EXELIST + to program names as necessary. + * m4/exeext.m4: Require AM_CYGWIN32. + +Thu Jul 31 17:36:10 1997 Ian Lance Taylor + + * ylwrap (pairlist): Shift out trailing "--"; don't pass it to + $prog. + + * texinfos.am: Add -I $(srcdir) when invoking $(MAKEINFO) for + CYGNUS .texinfo.info case and .texinfo case. + + * automake.in (handle_configure): Correct handling of inputs for + for AC_OUTPUT files when invoking config.status. + +Mon Jul 28 15:29:25 1997 Rob Savoye + + * m4/cygwin.m4: Set a variable CYGWIN32, rather than EXEEXT. + * m4/exeext.m4: New autoconf test for an executable suffix. + * m4/Makefile.in: Install the new exeext.m4 test. + Sun Jun 22 14:01:59 1997 Tom Tromey * Released version 1.2. diff --git a/automake.in b/automake.in index d2108df98..e894d19e8 100755 --- a/automake.in +++ b/automake.in @@ -39,7 +39,7 @@ $TAR = "@TAR@"; $IGNORE_PATTERN = "^##([^#].*)?\$"; $WHITE_PATTERN = "^[ \t]*\$"; $COMMENT_PATTERN = "^#"; -$RULE_PATTERN = "^([\$a-zA-Z_.][-.a-zA-Z0-9_(){}/]*) *:([^=].*|)\$"; +$RULE_PATTERN = "^([\$a-zA-Z_.][-.a-zA-Z0-9_(){}/\$]*) *:([^=].*|)\$"; $MACRO_PATTERN = "^([A-Za-z][A-Za-z0-9_]*)[ \t]*:?=[ \t]*(.*)\$"; $BOGUS_MACRO_PATTERN = "^([^ \t]*)[ \t]*:?=[ \t]*(.*)\$"; $GNITS_VERSION_PATTERN = "[0-9]+\\.[0-9]+([a-z]|\\.[0-9]+)?"; @@ -197,8 +197,8 @@ $package_version_line = 0; # TRUE if we've seen AM_PATH_LISPDIR. $seen_lispdir = 0; -# TRUE if we've seen AM_CYGWIN32. -$seen_cygwin32 = 0; +# TRUE if we've seen AM_EXEEXT. +$seen_exeext = 0; # Hash table of discovered configure substitutions. Keys are names, # values are meaningless. @@ -1529,14 +1529,14 @@ sub handle_programs $xlink = $linker ? $linker : 'LINK'; } - local ($cygxform); - if (! $seen_cygwin32) + local ($xexe); + if ($seen_exeext && $one_file !~ /\./) { - $cygxform = 's/^CYGWIN.*$//; s/^NOTCYGWIN//;'; + $xexe = 's/\@EXEEXT\@/\$(EXEEXT)/g;'; } else { - $cygxform = 's/^NOTCYGWIN.*$//; s/^CYGWIN//;'; + $xexe = 's/\@EXEEXT\@//g;'; } $output_rules .= @@ -1544,7 +1544,7 @@ sub handle_programs ('s/\@PROGRAM\@/' . $one_file . '/go;' . 's/\@XPROGRAM\@/' . $xname . '/go;' . 's/\@XLINK\@/' . $xlink . '/go;' - . $cygxform, + . $xexe, 'program'); } @@ -3052,6 +3052,7 @@ sub handle_configure local (@actual_other_files) = (); local ($file, $local); local (@inputs, @rewritten_inputs, $single); + local ($need_rewritten); foreach $file (@other_input_files) { if ($file =~ /^(.*):(.*)$/) @@ -3061,6 +3062,7 @@ sub handle_configure $local = &basename ($file); @inputs = split (':', $2); @rewritten_inputs = &rewrite_inputs_into_dependencies (@inputs); + $need_rewritten = 1; } else { @@ -3069,6 +3071,7 @@ sub handle_configure @inputs = ($local . '.in'); @rewritten_inputs = &rewrite_inputs_into_dependencies ($file . '.in'); + $need_rewritten = 0; } # Skip files not in this directory. @@ -3094,7 +3097,7 @@ sub handle_configure . "\t" . 'cd $(top_builddir) && CONFIG_FILES=' . ($relative_dir eq '.' ? '' : '$(subdir)/') - . '$@' . (length (@rewritten_inputs) > 0 + . '$@' . ($need_rewritten ? (':' . join (':', @rewritten_inputs)) : '') . ' CONFIG_HEADERS= ./config.status' @@ -3939,10 +3942,10 @@ sub scan_one_configure_file # Check for ansi2knr. $am_c_prototypes = 1 if /AM_C_PROTOTYPES/; - # Check for Cygwin32. - if (/AM_CYGWIN32/) + # Check for exe extension stuff. + if (/AM_EXEEXT/) { - $seen_cygwin32 = 1; + $seen_exeext = 1; $configure_vars{'EXEEXT'} = 1; } @@ -4160,9 +4163,9 @@ sub check_cygnus &am_conf_error ("\`AM_MAINTAINER_MODE' required when --cygnus specified"); } - if (! $seen_cygwin32) + if (! $seen_exeext) { - &am_conf_error ("\`AM_CYGWIN32' required when --cygnus specified"); + &am_conf_error ("\`AM_EXEEXT' required when --cygnus specified"); } } @@ -5579,13 +5582,13 @@ sub am_install_var } local ($cygxform); - if (! $seen_cygwin32) + if (! $seen_exeext) { - $cygxform = 's/\@EXEEXT\@//g; s/^NOTCYGWIN//; s/^CYGWIN.*$//;'; + $cygxform = 's/\@EXEEXT\@//g;'; } else { - $cygxform = 's/\@EXEEXT\@/\$(EXEEXT)/g; s/^CYGWIN//; s/^NOTCYGWIN.*$//;'; + $cygxform = 's/\@EXEEXT\@/\$(EXEEXT)/g;'; } while (@args) @@ -5660,15 +5663,83 @@ sub am_install_var { $require_extra = $one_name; } + next; } + push (@result, $rcurs); } # "EXTRA" shouldn't be used when generating clean targets, - # @all, or install targets. + # all, or install targets. next if $X eq 'EXTRA'; + # A blatant hack: we rewrite each _PROGRAMS primary to + # include EXEEXT when in Cygwin32 mode. + if ($seen_exeext && $primary eq 'PROGRAMS') + { + local (@conds) = &variable_conditions ($one_name); + local (@one_binlist); + + # FIXME: this definitely loses aesthetically; it + # redefines $ONE_NAME. Instead we should arrange for + # variable definitions to be output later, instead of + # at scan time. + + if (! @conds) + { + @one_binlist = (); + foreach $rcurs (&variable_value_as_list ($one_name, '')) + { + if ($rcurs =~ /\./ || $rcurs =~ /^\@.*\@$/) + { + push (@one_binlist, $rcurs); + } + else + { + push (@one_binlist, $rcurs . '$(EXEEXT)'); + } + } + + delete $contents{$one_name}; + &define_pretty_variable ($one_name, '', @one_binlist); + } + else + { + local ($cond); + local ($condvals) = ''; + foreach $cond (@conds) + { + @one_binlist = (); + local (@condval) = &variable_value_as_list ($one_name, + $cond); + foreach $rcurs (@condval) + { + if ($rcurs =~ /\./ || $rcurs =~ /^\@.*\@$/) + { + push (@one_binlist, $rcurs); + } + else + { + push (@one_binlist, $rcurs . '$(EXEEXT)'); + } + } + + push (@condvals, $cond); + push (@condvals, join (' ', @one_binlist)); + } + + delete $contents{$one_name}; + + while (@condvals) + { + $cond = shift (@condvals); + local (@val) = split (' ', shift (@condvals)); + &define_pretty_variable ($one_name, $cond, @val); + } + } + } + if ($do_clean) { $output_rules .= diff --git a/lib/am/program.am b/lib/am/program.am index 91bf3652b..be5fb26d3 100644 --- a/lib/am/program.am +++ b/lib/am/program.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -15,20 +15,11 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -@PROGRAM@: $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_DEPENDENCIES) +@PROGRAM@@EXEEXT@: $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_DEPENDENCIES) ## Remove program before linking. Otherwise the link will fail if the ## program is running somewhere. FIXME: this could be a loss if ## you're using an incremental linker. Maybe we should think twice? ## Or maybe not... sadly, incremental linkers are rarer than losing ## systems. -NOTCYGWIN @rm -f @PROGRAM@ -CYGWIN @rm -f @PROGRAM@$(EXEEXT) + @rm -f @PROGRAM@@EXEEXT@ $(@XLINK@) $(@XPROGRAM@_LDFLAGS) $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_LDADD) $(LIBS) -## Why take such a funny approach to Cygwin32 executables? Why not -## just rewrite this file to PROGRAM$(EXEEXT), and then rewrite -## foo_PROGRAMS similarly? Because then EXTRA_PROGRAMS won't work -## correctly -- every configure.in will have to know to add $(EXEEXT) -## when putting a program name into a variable. By doing things this -## way we can get Cygwin32 support by adding a single macro to -## configure.in and then re-running automake. -CYGWIN @test -z "$(EXEEXT)" || echo timestamp > @PROGRAM@ diff --git a/lib/am/progs.am b/lib/am/progs.am index f3a5a7bff..51ede2c39 100644 --- a/lib/am/progs.am +++ b/lib/am/progs.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -21,19 +21,17 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @list='$(@DIR@_PROGRAMS)'; for p in $$list; do \ -## This works even in Cygwin32, because we've explicitly touched the -## "real" program name after building it. if test -f $$p; then \ ## Note that we explicitly set the libtool mode. This avoids any ## lossage if the install program doesn't have a name that libtool ## expects. - echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p@EXEEXT@ $(@DIR@dir)/`echo $$p|sed '$(transform)'`@EXEEXT@"; \ - @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p@EXEEXT@ $(@DIR@dir)/`echo $$p|sed '$(transform)'`@EXEEXT@; \ + echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ + @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ else :; fi; \ done uninstall-@DIR@PROGRAMS: $(NORMAL_UNINSTALL) list='$(@DIR@_PROGRAMS)'; for p in $$list; do \ - rm -f $(@DIR@dir)/`echo $$p|sed '$(transform)'`@EXEEXT@; \ + rm -f $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ done diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am index c4f9b6971..a91a765f3 100644 --- a/lib/am/remake-hdr.am +++ b/lib/am/remake-hdr.am @@ -15,7 +15,7 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -@CONFIG_HEADER@: @STAMP@ +@CONFIG_HEADER@: @STAMP@ ; @: ## Explicitly look in srcdir for benefit of non-GNU makes. @STAMP@: $(srcdir)/@CONFIG_HEADER_IN@ $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index c19e3769f..87cbc8a5f 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -64,7 +64,7 @@ NOTCYGNUS @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] NOTCYGNUS cd $(srcdir) \ NOTCYGNUS && $(MAKEINFO) `echo $< | sed 's,.*/,,'` CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9] -CYGNUS $(MAKEINFO) $< +CYGNUS $(MAKEINFO) -I $(srcdir) $< .texinfo: ## We want to force the .info file to be built in srcdir. This is @@ -79,7 +79,7 @@ NOTCYGNUS @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] NOTCYGNUS cd $(srcdir) \ NOTCYGNUS && $(MAKEINFO) `echo $< | sed 's,.*/,,'` CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9] -CYGNUS $(MAKEINFO) $< +CYGNUS $(MAKEINFO) -I $(srcdir) $< .texinfo.dvi: TEXINPUTS=@TEXINFODIR@:$$TEXINPUTS \ diff --git a/m4/Makefile.am b/m4/Makefile.am index a6ea588a2..42571deec 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -7,6 +7,6 @@ m4datadir = $(datadir)/aclocal m4data_DATA = ccstdc.m4 dmalloc.m4 init.m4 install.m4 lispdir.m4 \ maintainer.m4 protos.m4 ptrdiff.m4 regex.m4 strtod.m4 termios.m4 \ winsz.m4 mktime.m4 error.m4 obstack.m4 sanity.m4 header.m4 missing.m4 \ -cygwin.m4 cond.m4 +cygwin.m4 cond.m4 exeext.m4 EXTRA_DIST = $(m4data_DATA) diff --git a/m4/Makefile.in b/m4/Makefile.in index 180ee4dc9..330e44a0a 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -2,8 +2,7 @@ # Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# gives unlimited permission to copy, distribute and modify it. SHELL = /bin/sh @@ -63,7 +62,7 @@ m4datadir = $(datadir)/aclocal m4data_DATA = ccstdc.m4 dmalloc.m4 init.m4 install.m4 lispdir.m4 \ maintainer.m4 protos.m4 ptrdiff.m4 regex.m4 strtod.m4 termios.m4 \ winsz.m4 mktime.m4 error.m4 obstack.m4 sanity.m4 header.m4 missing.m4 \ -cygwin.m4 cond.m4 +cygwin.m4 cond.m4 exeext.m4 EXTRA_DIST = $(m4data_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/m4/cygwin.m4 b/m4/cygwin.m4 dissimilarity index 75% index 00e8fb11e..6d16241e1 100644 --- a/m4/cygwin.m4 +++ b/m4/cygwin.m4 @@ -1,24 +1,12 @@ -# Check to see if we're running under Cygwin32, without using -# AC_CANONICAL_*. If so, set output variable EXEEXT to ".exe". -# Otherwise set it to "". - -dnl AM_CYGWIN32() -dnl You might think we can do this by checking for a cygwin32-specific -dnl cpp define. We can't, because cross-compilers that target -dnl cygwin32 don't use the .exe suffix. I don't know why. -AC_DEFUN(AM_CYGWIN32, -[AC_CACHE_CHECK(for Cygwin32 environment, am_cv_cygwin32, -[cat > conftest.$ac_ext << 'EOF' -int main () { -/* Nothing. */ -return 0; } -EOF -if AC_TRY_EVAL(ac_link) && test -s conftest.exe; then - am_cv_cygwin32=yes -else - am_cv_cygwin32=no -fi -rm -f conftest*]) -EXEEXT= -test "$am_cv_cygwin32" = yes && EXEEXT=.exe -AC_SUBST(EXEEXT)]) +# Check to see if we're running under Cygwin32, without using +# AC_CANONICAL_*. If so, set output variable CYGWIN32 to "yes". +# Otherwise set it to "no". + +dnl AM_CYGWIN32() +AC_DEFUN(AM_CYGWIN32, +[AC_CACHE_CHECK(for Cygwin32 environment, am_cv_cygwin32, +[AC_TRY_COMPILE(,[int main () { return __CYGWIN32__; }], +am_cv_cygwin32=yes, am_cv_cygwin32=no) +rm -f conftest*]) +CYGWIN32= +test "$am_cv_cygwin32" = yes && CYGWIN32=yes]) diff --git a/m4/exeext.m4 b/m4/exeext.m4 new file mode 100644 index 000000000..a73febe98 --- /dev/null +++ b/m4/exeext.m4 @@ -0,0 +1,29 @@ +# Check to see if we're running under Win32, without using +# AC_CANONICAL_*. If so, set output variable EXEEXT to ".exe". +# Otherwise set it to "". + +dnl AM_EXEEXT() +dnl This knows we add .exe if we're building in the Cygwin32 +dnl environment. But if we're not, then it compiles a test program +dnl to see if there is a suffix for executables. +AC_DEFUN(AM_EXEEXT, +[AC_REQUIRE([AM_CYGWIN32]) +AC_MSG_CHECKING([for executable suffix]) +AC_CACHE_VAL(am_cv_exeext, +[if test "$CYGWIN32" = yes; then +am_cv_exeext=.exe +else +cat > am_c_test.c << 'EOF' +int main() { +/* Nothing needed here */ +} +EOF +${CC-cc} -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS am_c_test.c $LIBS 1>&5 +am_cv_exeext=`echo am_c_test.* | grep -v am_c_test.c | sed -e s/am_c_test//` +rm -f am_c_test*]) +test x"${am_cv_exeext}" = x && am_cv_exeext=no +fi +EXEEXT="" +test x"${am_cv_exeext}" != xno && EXEEXT=${am_cv_exeext} +AC_MSG_RESULT(${am_cv_exeext}) +AC_SUBST(EXEEXT)]) diff --git a/program.am b/program.am index 91bf3652b..be5fb26d3 100644 --- a/program.am +++ b/program.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -15,20 +15,11 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -@PROGRAM@: $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_DEPENDENCIES) +@PROGRAM@@EXEEXT@: $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_DEPENDENCIES) ## Remove program before linking. Otherwise the link will fail if the ## program is running somewhere. FIXME: this could be a loss if ## you're using an incremental linker. Maybe we should think twice? ## Or maybe not... sadly, incremental linkers are rarer than losing ## systems. -NOTCYGWIN @rm -f @PROGRAM@ -CYGWIN @rm -f @PROGRAM@$(EXEEXT) + @rm -f @PROGRAM@@EXEEXT@ $(@XLINK@) $(@XPROGRAM@_LDFLAGS) $(@XPROGRAM@_OBJECTS) $(@XPROGRAM@_LDADD) $(LIBS) -## Why take such a funny approach to Cygwin32 executables? Why not -## just rewrite this file to PROGRAM$(EXEEXT), and then rewrite -## foo_PROGRAMS similarly? Because then EXTRA_PROGRAMS won't work -## correctly -- every configure.in will have to know to add $(EXEEXT) -## when putting a program name into a variable. By doing things this -## way we can get Cygwin32 support by adding a single macro to -## configure.in and then re-running automake. -CYGWIN @test -z "$(EXEEXT)" || echo timestamp > @PROGRAM@ diff --git a/progs-clean.am b/progs-clean.am index 05ff53ad8..e0e4112b8 100644 --- a/progs-clean.am +++ b/progs-clean.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -18,10 +18,7 @@ mostlyclean-@DIR@PROGRAMS: clean-@DIR@PROGRAMS: -NOTCYGWIN test -z "$(@DIR@_PROGRAMS)" || rm -f $(@DIR@_PROGRAMS) -CYGWIN @list='$(@DIR@_PROGRAMS)'; for p in $$list; do \ -CYGWIN rm -f $$p $$p$(EXEEXT); \ -CYGWIN done + test -z "$(@DIR@_PROGRAMS)" || rm -f $(@DIR@_PROGRAMS) distclean-@DIR@PROGRAMS: diff --git a/progs.am b/progs.am index f3a5a7bff..51ede2c39 100644 --- a/progs.am +++ b/progs.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -21,19 +21,17 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @list='$(@DIR@_PROGRAMS)'; for p in $$list; do \ -## This works even in Cygwin32, because we've explicitly touched the -## "real" program name after building it. if test -f $$p; then \ ## Note that we explicitly set the libtool mode. This avoids any ## lossage if the install program doesn't have a name that libtool ## expects. - echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p@EXEEXT@ $(@DIR@dir)/`echo $$p|sed '$(transform)'`@EXEEXT@"; \ - @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p@EXEEXT@ $(@DIR@dir)/`echo $$p|sed '$(transform)'`@EXEEXT@; \ + echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \ + @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ else :; fi; \ done uninstall-@DIR@PROGRAMS: $(NORMAL_UNINSTALL) list='$(@DIR@_PROGRAMS)'; for p in $$list; do \ - rm -f $(@DIR@dir)/`echo $$p|sed '$(transform)'`@EXEEXT@; \ + rm -f $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \ done diff --git a/remake-hdr.am b/remake-hdr.am index c4f9b6971..a91a765f3 100644 --- a/remake-hdr.am +++ b/remake-hdr.am @@ -15,7 +15,7 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -@CONFIG_HEADER@: @STAMP@ +@CONFIG_HEADER@: @STAMP@ ; @: ## Explicitly look in srcdir for benefit of non-GNU makes. @STAMP@: $(srcdir)/@CONFIG_HEADER_IN@ $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/tests/ChangeLog b/tests/ChangeLog index 95b5103cc..a7805f30b 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +Mon Aug 25 17:24:42 1997 Tom Tromey + + * cygwin32.test: Use AM_EXEEXT, not AM_CYGWIN32. + Tue Aug 5 20:33:33 1997 Tom Tromey * libobj6.test: New file. diff --git a/tests/cygwin32.test b/tests/cygwin32.test index 42882389b..99fa66a88 100755 --- a/tests/cygwin32.test +++ b/tests/cygwin32.test @@ -6,7 +6,7 @@ cat >> configure.in << 'END' AC_PROG_CC -AM_CYGWIN32 +AM_EXEEXT END cat > Makefile.am << 'END' diff --git a/texinfos.am b/texinfos.am index c19e3769f..87cbc8a5f 100644 --- a/texinfos.am +++ b/texinfos.am @@ -64,7 +64,7 @@ NOTCYGNUS @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] NOTCYGNUS cd $(srcdir) \ NOTCYGNUS && $(MAKEINFO) `echo $< | sed 's,.*/,,'` CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9] -CYGNUS $(MAKEINFO) $< +CYGNUS $(MAKEINFO) -I $(srcdir) $< .texinfo: ## We want to force the .info file to be built in srcdir. This is @@ -79,7 +79,7 @@ NOTCYGNUS @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] NOTCYGNUS cd $(srcdir) \ NOTCYGNUS && $(MAKEINFO) `echo $< | sed 's,.*/,,'` CYGNUS @rm -f $@ $@-[0-9] $@-[0-9][0-9] -CYGNUS $(MAKEINFO) $< +CYGNUS $(MAKEINFO) -I $(srcdir) $< .texinfo.dvi: TEXINPUTS=@TEXINFODIR@:$$TEXINPUTS \ -- 2.11.4.GIT