From 30c068a44a0ef7e8aeff53ab4f690fa5f922a9e5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 16 May 1996 04:33:51 +0000 Subject: [PATCH] Fixes --- ChangeLog | 33 +++++++++++++++++++ Makefile.in | 18 ++++++++++- NEWS | 6 ++++ TODO | 43 +++++++++++++++++-------- aclocal.m4 | 20 ++++++++++++ automake.in | 89 +++++++++++++++++++++++++++++++++++++--------------- automake.texi | 24 +++++++++++--- configure | 19 +++++------ configure.in | 2 +- lib/am/remake-hdr.am | 4 +-- remake-hdr.am | 4 +-- remake-subd.am | 2 +- remake.am | 4 +-- tests/ChangeLog | 8 +++++ tests/Makefile.am | 3 +- tests/Makefile.in | 5 +-- tests/auxdir.test | 20 ++++++++++++ tests/canon3.test | 16 ++++++++++ tests/mdate2.test | 22 +++++++++++++ tests/mkinstall.test | 16 ++++++++++ texi-version.am | 4 +-- version.texi | 6 ++-- 22 files changed, 296 insertions(+), 72 deletions(-) create mode 100755 tests/auxdir.test create mode 100755 tests/canon3.test create mode 100755 tests/mdate2.test create mode 100755 tests/mkinstall.test diff --git a/ChangeLog b/ChangeLog index 3d4a22ac9..486810762 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,38 @@ +Tue May 14 21:52:01 1996 Tom Tromey + + * automake.in (seen_maint_mode): New global. + (scan_configure): Handle jm_MAINTAINER_MODE. + (read_am_file): Handle seen_maint_mode. + (file_contents_with_transform): Handle seen_maint_mode. + (handle_source_transform): Changed interface, all callers. + + From Jim Meyering: + * remake-hdr.am, remake-subd.am, remake.am, texi-version.am: + Handle @MAINT@. + * aclocal.m4 (jm_MAINTAINER_MODE): New macro. + + * automake.in (handle_configure): Check $config_aux_dir against + empty string. From Markku Rossi. Test mkinstall.test. + +Fri May 10 14:38:47 1996 Gord Matzigkeit + + * automake.in (distcheck): Added new rule to top level + Makefile.in. + +Wed May 8 21:57:21 1996 Gord Matzigkeit + + * automake.in (scan_configure): Make sure that gm_PROG_LIBTOOL + sets seen_ranlib. + (generate_makefile): libtool, config.sub, and config.guess should + only ever appear in the top directory of a package. + Tue May 14 10:24:30 1996 Tom Tromey + * automake.in (initialize_global_constants): Added libversion.in + to @common_files. + + * configure.in (VERSION): Upped to 0.33. + * automake.in (am_install_var): Fixed problem in EXTRA_ handling. Test extra.test. diff --git a/Makefile.in b/Makefile.in index 737e227b8..07904a5c9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 0.32 from Makefile.am +# Makefile.in generated automatically by automake 0.33 from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -266,6 +266,22 @@ distclean-tags: maintainer-clean-tags: distdir = $(PACKAGE)-$(VERSION) +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + rm -rf $(distdir) + $(TAR) zxf $(distdir).tar.gz + mkdir $(distdir)/$(distdir) + cd $(distdir)/$(distdir) \ + && ../configure --srcdir=.. \ + && $(MAKE) \ + && $(MAKE) check \ + && $(MAKE) dist + rm -rf $(distdir) + @echo "========================"; \ + echo "$(distdir).tar.gz is ready for distribution"; \ + echo "========================" dist: distdir chmod -R a+r $(distdir) $(TAR) chozf $(distdir).tar.gz $(distdir) diff --git a/NEWS b/NEWS index 0c888525e..58a828d4e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +New in 0.33: +* More bug fixes +* More libtool fixes from Gord Matzigkeit; libtool support is still + preliminary however. +* Added support for jm_MAINTAINER_MODE + New in 0.32: * Many bug fixes * mkinstalldirs and mdate-sh now appear in directory specified by diff --git a/TODO b/TODO index 8feadae44..186e66cd9 100644 --- a/TODO +++ b/TODO @@ -1,16 +1,21 @@ Priorities for release: -* make the auto-dep code crash if GNU make not in use? - (doesn't it already?) -* Add no-remake option -* scripts are installed in $exec_prefix/bin, not $prefix/bin - Bug or feature? +* automake can't run on itself!!! write test for this one + * ansi2knr.c needs STDC_HEADERS and HAVE_STRING_H -Bug: the mkinstalldirs code will fail unless the top-level Makefile is -done first; "automake lib/Makefile Makefile" will fail. +* Add way to tell automake that `configure' has unknown dependencies + +Think about: maybe "make check" should just bomb if error occurs? +Then user must use "make -k check". This is probably more natural. + +Consider: should Gnits require jm_MAINTAINER_MODE? + +Consider: "cvs" option adds some cvs-specific rules? + +Consider adding an option that statically rewrites @MAINT@ to "#M#". Right now, targets generated internally (eg "install") are not -overridable by use code. This should probably be possible, even +overridable by user code. This should probably be possible, even though it isn't very important. This could be done by generating all internal rules via a function call instead of just appending to $output_rules. @@ -37,11 +42,6 @@ Things to finish libtool support: Scan source directories and warn about missing files, eg .c/.h files that aren't mentioned? -Gord Matzigkeit says: -> Can there be a way to specify that only object files be built? -> This is useful for testing dynamic linking (the dld library) and -> loadable kernel modules. - Currently gettext requires @INTLSUB@ and @POSUB@ in SUBDIRS. In the future this will be just intl and po. When that happens, re-enable warnings in handle_subdirs. @@ -57,6 +57,9 @@ an option Think about ways to make automake fit better with Cygnus-style trees. +Automake should complain if PACKAGE and VERSION are not defined in +configure.in. + Use recode in dist target when MAINT_CHARSET specified. Read caveats in automake.in before doing this. Note the same problem used to apply to the no-dependencies option; maybe it still should? Note also that @@ -244,10 +247,16 @@ Libraries: ================================================================ +Longer term: + Have a program that generates a Makefile on stdout, passes it through a "config.status"-style filter, and thence into make. Why bother, other than the gee-whiz factor? +It might be interesting to figure out how a GNU system could use +Makefile.am's without resorting to Automake. This might be impossible +in a practical sense. + Would it be useful to integrate in some way with the Debian package building utility? Must check. maybe it would be possible to deal with all the different package utilities somehow. Lately I've been @@ -289,3 +298,11 @@ must look at mkid to see how it works (for subdir usage) if configure.in not found, move up a directory and try again? This could eliminate a common source of problems. [ this is just a bad idea ] + +* scripts are installed in $exec_prefix/bin, not $prefix/bin + Bug or feature? + [ the consensus on Gnits is that this isn't required. + doubters can work around it anyway ] + +* make the auto-dep code crash if GNU make not in use? + (doesn't it already?) diff --git a/aclocal.m4 b/aclocal.m4 index 7774ad9c5..4f5c34dcc 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -83,3 +83,23 @@ AC_DEFUN(fp_PROG_INSTALL, test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 755' AC_SUBST(INSTALL_SCRIPT)dnl ]) + + +# Add --enable-maintainer-mode option to configure. +AC_DEFUN(jm_MAINTAINER_MODE, +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT($USE_MAINTAINER_MODE) + if test $USE_MAINTAINER_MODE = yes; then + MAINT= + else + MAINT='#M#' + fi + AC_SUBST(MAINT)dnl +] +) diff --git a/automake.in b/automake.in index ecc01a6da..8d2b0d23c 100755 --- a/automake.in +++ b/automake.in @@ -145,6 +145,10 @@ $seen_arg_prog = 0; $seen_libtool = 0; $libtool_line = 0; +# TRUE if we've seen jm_MAINTAINER_MODE. +$seen_maint_mode = 0; + + # Charsets used by maintainer and in distribution. MAINT_CHARSET is # handled in a funny way: if seen in the top-level Makefile.am, it is # used for every directory which does not specify a different value. @@ -324,10 +328,20 @@ sub generate_makefile &initialize_per_input; $relative_dir = &dirname ($makefile); - # AC_CANONICAL_HOST and AC_CANONICAL_SYSTEM need config.guess and - # config.sub. - &require_config_file ($FOREIGN, 'config.guess', 'config.sub') - if $relative_dir eq '.' && $seen_canonical; + # At the toplevel directory, we might need config.guess, config.sub + # or libtool. + if ($relative_dir eq '.') + { + # libtool requires some files. + &require_conf_file_with_conf_line ($libtool_line, $FOREIGN, + 'config.sub', 'config.guess', + 'libtool') if $seen_libtool; + + # AC_CANONICAL_HOST and AC_CANONICAL_SYSTEM need config.guess and + # config.sub. + &require_config_file ($FOREIGN, 'config.guess', 'config.sub') + if $seen_canonical; + } # We still need Makefile.in here, because sometimes the `dist' # target doesn't re-run automake. @@ -499,7 +513,9 @@ sub get_object_extension # Handle SOURCE->OBJECT transform for one program or library. sub handle_source_transform { - local ($one_file, $obj) = @_; + # one_file is canonical name. unxformed is given name. obj is + # object extension. + local ($one_file, $unxformed, $obj) = @_; local ($objpat) = $obj; $objpat =~ s/(\W)/\\$1/g; @@ -525,12 +541,12 @@ sub handle_source_transform } elsif ($prefix eq '') { - $output_vars .= ($one_file . "_SOURCES = " . $one_file . ".c\n" - . $one_file . "_OBJECTS = ". $one_file + $output_vars .= ($one_file . "_SOURCES = " . $unxformed . ".c\n" + . $one_file . "_OBJECTS = ". $unxformed . $obj . "\n"); - push (@sources, $one_file . '.c'); - push (@objects, $one_file . $obj); - $source_list = $one_file . ".c "; + push (@sources, $unxformed . '.c'); + push (@objects, $unxformed . $obj); + $source_list = $unxformed . ".c "; } else { @@ -669,7 +685,7 @@ sub handle_programs } } - &handle_source_transform ($xname, $obj); + &handle_source_transform ($xname, $one_file, $obj); if (&variable_defined ($xname . "_LDADD")) { @@ -700,14 +716,7 @@ sub handle_libraries 'lib', 'pkglib', 'noinst', 'check'); return if ! @liblist; - if ($seen_libtool) - { - # libtool requires some files. - &require_conf_file_with_conf_line ($libtool_line, $FOREIGN, - 'config.sub', 'config.guess', - 'libtool'); - } - elsif (! $seen_ranlib) + if (! $seen_ranlib) { # FIXME need am_line_error here. But we don't know which # variable exists. Must add a loop... No. Must have @@ -751,7 +760,7 @@ sub handle_libraries $output_vars .= $onelib . "_LIBADD =\n"; } - &handle_source_transform ($onelib, $obj); + &handle_source_transform ($onelib, $onelib, $obj); $output_rules .= &file_contents_with_transform ('s/\@LIBRARY\@/' . $onelib . '/go', @@ -1236,6 +1245,25 @@ sub handle_dist # Generate 'dist' target, and maybe dist-shar. if ($relative_dir eq '.') { + # Rule to check whether a distribution is viable. + $output_rules .= '# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + rm -rf $(distdir) + $(TAR) zxf $(distdir).tar.gz + mkdir $(distdir)/$(distdir) + cd $(distdir)/$(distdir) \\ + && ../configure --srcdir=.. \\ + && $(MAKE) \\ + && $(MAKE) check \\ + && $(MAKE) dist + rm -rf $(distdir) + @echo "========================"; \\ + echo "$(distdir).tar.gz is ready for distribution"; \\ + echo "========================" +'; + $output_rules .= 'dist: distdir' . "\n\t"; $output_rules .= 'chmod -R a+r $(distdir)' . "\n\t"; $output_rules .= '$(TAR) chozf $(distdir).tar.gz $(distdir)'; @@ -1351,6 +1379,9 @@ sub handle_configure &am_line_error ('SUBDIRS', "AC_PROG_MAKE_SET must be used in configure.in") if &variable_defined ('SUBDIRS') && ! $seen_make_set; + # Look for some files we need. Always check for these. + &require_config_file ($FOREIGN, 'install-sh', 'mkinstalldirs'); + local ($top_reldir); if ($relative_dir ne '.') { @@ -1367,9 +1398,6 @@ sub handle_configure } $output_rules .= &file_contents ('remake'); - # Look for some files we need. - &require_config_file ($FOREIGN, 'install-sh', 'mkinstalldirs'); - &am_error ("\`install.sh' is an anachronism; use \`install-sh' instead") if -f $relative_dir . '/install.sh'; @@ -1414,7 +1442,7 @@ sub handle_configure } # Set location of mkinstalldirs. - if ($config_aux_dir ne '.') + if ($config_aux_dir ne '.' && $config_aux_dir ne '') { $output_vars .= 'mkinstalldirs = ' . $config_aux_dir; } @@ -2038,10 +2066,12 @@ sub scan_configure $seen_prog_install = 2 if ! $seen_prog_install && /fp_PROG_INSTALL/; $seen_arg_prog = 1 if /AC_ARG_PROGRAM/; $seen_ranlib = 1 if /AC_PROG_RANLIB/; + $seen_maint_mode = 1 if /jm_MAINTAINER_MODE/; if (/AC_PROG_LIBTOOL/ || /gm_PROG_LIBTOOL/) { $seen_libtool = 1; + $seen_ranlib = 2; $libtool_line = $.; } } @@ -2230,6 +2260,9 @@ sub read_am_file $_ .= "\n" unless substr ($_, -1, 1) eq "\n"; + $_ =~ s/\@MAINT\@//g + unless $seen_maint_mode; + if (/$IGNORE_PATTERN/o) { # Merely delete comments beginning with two hashes. @@ -2360,7 +2393,8 @@ sub initialize_global_constants ( "README", "THANKS", "TODO", "NEWS", "COPYING", "COPYING.LIB", "INSTALL", "ABOUT-NLS", "ChangeLog", "configure", "configure.in", - "config.guess", "config.sub", "AUTHORS", "BACKLOG", "ABOUT-GNU" + "config.guess", "config.sub", "AUTHORS", "BACKLOG", "ABOUT-GNU", + "libversion.in" ); # Commonly used files we auto-include, but only sometimes. @@ -2501,6 +2535,9 @@ sub file_contents_with_transform while () { + $_ =~ s/\@MAINT\@//g + unless $seen_maint_mode; + eval $command; if (/$IGNORE_PATTERN/o) @@ -2574,7 +2611,7 @@ sub file_contents } # Handle `where_HOW' variable magic. Does all lookups, generates -# install code,and possibly generates code to define the primary +# install code, and possibly generates code to define the primary # variable. The first argument is the name of the .am file to munge, # the second argument is the primary variable (eg HEADERS), and all # subsequent arguments are possible installation locations. Returns diff --git a/automake.texi b/automake.texi index 74ac7d147..8027481c7 100644 --- a/automake.texi +++ b/automake.texi @@ -507,8 +507,9 @@ required. @item gm_PROG_LIBTOOL @item AC_PROG_LIBTOOL -Automake will turn on processing for @code{libtool}. FIXME xref. This -work is still preliminary. +Automake will turn on processing for @code{libtool} (@pxref{Top, , The +Libtool Manual, libtool.info, The Libtool Manual}). This work is +still preliminary. @cvindex gm_PROG_LIBTOOL @cvindex AC_PROG_LIBTOOL @@ -528,11 +529,19 @@ This macro is required for packages which use GNU gettext (FIXME xref). It is distributed with gettext. Automake uses this macro to ensure that the package meets some of gettext's requirements. @cvindex ud_GNU_GETTEXT + +@item jm_MAINTAINER_MODE +This macro adds a @samp{--enable-maintainer-mode} option to +@code{configure}. If this is used, @code{automake} will cause +``maintainer-only'' rules to be turned off by default in the generated +@file{Makefile.in}s. +@cvindex jm_MAINTAINER_MODE @end table -The @samp{fp_} macros are from @value{Francois} Pinard, and are included -with Automake. @code{automake} will tell where the macros can be found -if they are missing. +The @samp{fp_} macros are from @value{Francois} Pinard and the +@samp{jm_} macro is from Jim Meyering. Both sets are included with +Automake. @code{automake} will tell where the macros can be found if +they are missing. @node Top level @@ -1052,6 +1061,11 @@ dist-hook: cp -p random/a1 random/a2 $(distdir)/random @end example +Automake also generates a @code{distcheck} target which can be help to +ensure that a given distribution will actually work. @code{distcheck} +makes a distribution, and then tries to do a @code{VPATH} build. +@trindex distcheck + @node Tests @chapter Support for test suites diff --git a/configure b/configure index 3efdcefdf..f60eb2564 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.7 +# Generated automatically using autoconf version 2.8 # Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -330,7 +330,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.7" + echo "configure generated by autoconf version 2.8" exit 0 ;; -with-* | --with-*) @@ -495,12 +495,9 @@ fi ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='echo $CPP $CPPFLAGS 1>&5; -$CPP $CPPFLAGS' -ac_compile='echo ${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5; -${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='echo ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5; -${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. @@ -522,7 +519,7 @@ cat >> confdefs.h <> confdefs.h < conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%-D\1=\2%g +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g s%\[%\\&%g s%\]%\\&%g @@ -783,7 +780,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.7" + echo "$CONFIG_STATUS generated by autoconf version 2.8" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; diff --git a/configure.in b/configure.in index a96f9223c..c534fc7e7 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ dnl AC_CONFIG_HEADER(config.h) PACKAGE=automake AC_SUBST(PACKAGE) AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") -VERSION=0.32 +VERSION=0.33 AC_SUBST(VERSION) AC_DEFINE_UNQUOTED(VERSION, "$VERSION") ALL_LINGUAS= diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am index cfae00669..3fcfb846e 100644 --- a/lib/am/remake-hdr.am +++ b/lib/am/remake-hdr.am @@ -15,11 +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. -$(CONFIG_HEADER): stamp-h +$(CONFIG_HEADER): @MAINT@stamp-h stamp-h: $(CONFIG_HEADER_IN) config.status CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADER) ./config.status @echo timestamp > stamp-h -$(srcdir)/$(CONFIG_HEADER_IN): stamp-h.in +$(srcdir)/$(CONFIG_HEADER_IN): @MAINT@stamp-h.in $(srcdir)/stamp-h.in: configure.in $(ACLOCAL) $(ACCONFIG) $(CONFIG_TOP) $(CONFIG_BOT) cd $(srcdir) && autoheader echo timestamp > $(srcdir)/stamp-h.in diff --git a/remake-hdr.am b/remake-hdr.am index cfae00669..3fcfb846e 100644 --- a/remake-hdr.am +++ b/remake-hdr.am @@ -15,11 +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. -$(CONFIG_HEADER): stamp-h +$(CONFIG_HEADER): @MAINT@stamp-h stamp-h: $(CONFIG_HEADER_IN) config.status CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADER) ./config.status @echo timestamp > stamp-h -$(srcdir)/$(CONFIG_HEADER_IN): stamp-h.in +$(srcdir)/$(CONFIG_HEADER_IN): @MAINT@stamp-h.in $(srcdir)/stamp-h.in: configure.in $(ACLOCAL) $(ACCONFIG) $(CONFIG_TOP) $(CONFIG_BOT) cd $(srcdir) && autoheader echo timestamp > $(srcdir)/stamp-h.in diff --git a/remake-subd.am b/remake-subd.am index dbe95b1a9..9cedcd063 100644 --- a/remake-subd.am +++ b/remake-subd.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. -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in +$(srcdir)/Makefile.in: @MAINT@Makefile.am $(top_srcdir)/configure.in cd $(top_srcdir) && automake $(subdir)/Makefile Makefile: $(top_builddir)/config.status Makefile.in diff --git a/remake.am b/remake.am index c8523c41e..304f11f9b 100644 --- a/remake.am +++ b/remake.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. -$(srcdir)/Makefile.in: Makefile.am configure.in +$(srcdir)/Makefile.in: @MAINT@Makefile.am configure.in cd $(srcdir) && automake Makefile # For an explanation of the following Makefile rules, see node @@ -24,5 +24,5 @@ Makefile: Makefile.in config.status CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status config.status: configure ./config.status --recheck -$(srcdir)/configure: configure.in $(ACLOCAL) +$(srcdir)/configure: @MAINT@configure.in $(ACLOCAL) cd $(srcdir) && autoconf diff --git a/tests/ChangeLog b/tests/ChangeLog index 3e140ae9f..3f128d503 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,13 @@ Tue May 14 10:17:17 1996 Tom Tromey + * mdate2.test: New file. + + * canon3.test: New file. + + * auxdir.test: New file. + + * mkinstall.test: New file. + * extra.test: Reversed sense of test. Fri Apr 26 15:15:01 1996 Tom Tromey diff --git a/tests/Makefile.am b/tests/Makefile.am index 121b905b5..06f283ac8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,6 +6,7 @@ TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test \ acoutnoq.test acouttbs.test libobj.test proginst.test acoutqnl.test \ confincl.test spelling.test prefix.test badprog.test depend.test exdir.test \ canon.test installsh.test empty.test rulepat.test insh.test canon2.test \ -target.test extra.test noinst.test instman.test +target.test extra.test noinst.test instman.test mkinstall.test auxdir.test \ +canon3.test mdate2.test EXTRA_DIST = defs $(TESTS) diff --git a/tests/Makefile.in b/tests/Makefile.in index dfad26da0..1f43d4c37 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 0.32 from Makefile.am +# Makefile.in generated automatically by automake 0.33 from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -44,7 +44,8 @@ TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test \ acoutnoq.test acouttbs.test libobj.test proginst.test acoutqnl.test \ confincl.test spelling.test prefix.test badprog.test depend.test exdir.test \ canon.test installsh.test empty.test rulepat.test insh.test canon2.test \ -target.test extra.test noinst.test instman.test +target.test extra.test noinst.test instman.test mkinstall.test auxdir.test \ +canon3.test mdate2.test EXTRA_DIST = defs $(TESTS) mkinstalldirs = $(top_srcdir)/mkinstalldirs diff --git a/tests/auxdir.test b/tests/auxdir.test new file mode 100755 index 000000000..a0a22d21b --- /dev/null +++ b/tests/auxdir.test @@ -0,0 +1,20 @@ +#! /bin/sh + +# Test to make sure AC_CONFIG_AUX_DIR works correctly. + +. $srcdir/defs || exit 1 + +# The "./." is here so we don't have to mess with subdirs. +cat >> configure.in << 'END' +AC_CONFIG_AUX_DIR(./.) +END + +cat > Makefile.am << 'END' +pkgdata_DATA = +END + +# The "././" prefix confuses Automake into thinking it is doing a +# subdir build. Yes, this is hacky. +$AUTOMAKE ././Makefile || exit 1 + +grep '/\./\./mkinstalldirs' Makefile.in diff --git a/tests/canon3.test b/tests/canon3.test new file mode 100755 index 000000000..b94850ae4 --- /dev/null +++ b/tests/canon3.test @@ -0,0 +1,16 @@ +#! /bin/sh + +# Yet another canonicalization test. + +. $srcdir/defs || exit 1 + +cat > Makefile.am << 'END' +bin_PROGRAMS = perm-number +END + +: > perm-number.c + +$AUTOMAKE || exit 1 + +grep 'perm_number\.c' Makefile.in && exit 1 +exit 0 diff --git a/tests/mdate2.test b/tests/mdate2.test new file mode 100755 index 000000000..c27d8a88c --- /dev/null +++ b/tests/mdate2.test @@ -0,0 +1,22 @@ +#! /bin/sh + +# Test to make sure mdate-sh is included in distribution. + +. $srcdir/defs || exit 1 + +cat > Makefile.am << 'END' +info_TEXINFOS = textutils.texi +END + +cat > textutils.texi << 'END' +@include version.texi +END + +# Required when using Texinfo. +: > texinfo.tex +: > mdate-sh + +# Use "././" to confuse Automake into thinking this is a subdir build. +$AUTOMAKE ././Makefile || exit 1 + +grep 'mdate-sh' Makefile.in | grep -v SHELL diff --git a/tests/mkinstall.test b/tests/mkinstall.test new file mode 100755 index 000000000..eed6e8fea --- /dev/null +++ b/tests/mkinstall.test @@ -0,0 +1,16 @@ +#! /bin/sh + +# Test for bug where mkinstalldirs variable can be set incorrectly. + +. $srcdir/defs || exit 1 + +cat > Makefile.am << 'END' +pkgdata_DATA = +END + +# The "././" prefix confuses Automake into thinking it is doing a +# subdir build. Yes, this is hacky. +$AUTOMAKE ././Makefile || exit 1 + +grep ' /mkinstalldirs' Makefile.in && exit 1 +exit 0 diff --git a/texi-version.am b/texi-version.am index 51b9f6597..781766414 100644 --- a/texi-version.am +++ b/texi-version.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. -@VTEXI@: stamp-@VTI@ +@VTEXI@: @MAINT@stamp-@VTI@ ## Depend on configure.in so that version number updates cause a ## rebuild. @@ -39,4 +39,4 @@ clean-@VTI@: distclean-@VTI@: maintainer-clean-@VTI@: - rm -f stamp-@VTI@ @VTEXI@ + @MAINT@rm -f stamp-@VTI@ @VTEXI@ diff --git a/version.texi b/version.texi index 7a7e0e1e2..fbad6a461 100644 --- a/version.texi +++ b/version.texi @@ -1,3 +1,3 @@ -@set UPDATED 25 April 1996 -@set EDITION 0.32 -@set VERSION 0.32 +@set UPDATED 14 May 1996 +@set EDITION 0.33 +@set VERSION 0.33 -- 2.11.4.GIT