diff options
| author | Akim Demaille <akim@epita.fr> | 2001-04-09 14:06:40 +0000 |
|---|---|---|
| committer | Akim Demaille <akim@epita.fr> | 2001-04-09 14:06:40 +0000 |
| commit | 74d5d0616c4b8c59e33b2262ff03acce59e36ac3 (patch) | |
| tree | 38241f7709dae046997b3757fb18fcfe0ffc46c7 /lib | |
| parent | d49b6d17c3291d5810b46e951333d2bf5a8ed101 (diff) | |
| download | automake-74d5d0616c4b8c59e33b2262ff03acce59e36ac3.tar.gz | |
* automake.in (%dist_common): Remove.
(%configure_dist_common): Replace with...
($configure_dist_common): this.
(&generate_makefile): Read the user file before using
push_dist_common, as it sets DIST_COMMON, and read_am_file checks
that no variable is defined before it is run.
(&handle_texinfo): Don't handle DIST_COMMON, let your file do it.
(&dist_cmp): Rename as...
(&for_dist_common): this.
(&handle_dist): Don't handle DIST_COMMON, let `configure.am' do
it.
Adjust to $configure_dist_common.
* configure.am, texi-vers.am: Set DIST_COMMON.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/am/configure.am | 13 | ||||
| -rw-r--r-- | lib/am/texi-vers.am | 3 |
2 files changed, 13 insertions, 3 deletions
diff --git a/lib/am/configure.am b/lib/am/configure.am index 19f68246c..05d1f9bd7 100644 --- a/lib/am/configure.am +++ b/lib/am/configure.am @@ -34,14 +34,21 @@ -## --------------- ## -## config.status. ## -## --------------- ## +## --------------------------- ## +## config.status & configure. ## +## --------------------------- ## if %?TOPDIR_P% ## Explicitly look in srcdir for benefit of non-GNU makes. config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck + +## Always require configure.ac and configure at top level, even if they +## don't exist. This is especially important for configure, since it +## won't be created until autoconf is run -- which might be after +## automake is run. +DIST_COMMON += configure %CONFIGURE-AC% + ## Explicitly look in srcdir for benefit of non-GNU makes. $(srcdir)/configure: %MAINTAINER-MODE% $(srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am index 2576096c8..a0f7bea46 100644 --- a/lib/am/texi-vers.am +++ b/lib/am/texi-vers.am @@ -16,6 +16,9 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. + +DIST_COMMON += %VTEXI% stamp-%VTI% + $(srcdir)/%VTEXI%: %MAINTAINER-MODE% $(srcdir)/stamp-%VTI% @: |