[svn-r9912] Purpose:
Bug fix Description: Dependencies between configure files (aclocal, configure.in, configure, Makefiles.am and .in) are still causing Makefiles to try to run autotools during build. Solution: Committed all Makefiles.in to update their timestamps. As a temporary measure, forcibly prevented automake from running autotools during build by redefining the variables it uses. Platforms tested: sleipnir (No changes to Makefile content)
This commit is contained in:
@@ -51,11 +51,6 @@ pkglibdir = $(libdir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
top_builddir = ../../../..
|
||||
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
|
||||
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
@@ -81,6 +76,14 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
|
||||
# Install directories that automake doesn't know about
|
||||
includedir = $(exec_prefix)/include
|
||||
|
||||
|
||||
# Prevent automake from trying to run autotools during build
|
||||
# Temporary fix (I hope!) - JAMES
|
||||
ACLOCAL =
|
||||
AUTOCONF =
|
||||
AUTOMAKE =
|
||||
AUTOHEADER =
|
||||
ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
@@ -380,88 +383,6 @@ uninstall-am: uninstall-info-am uninstall-localdocDATA \
|
||||
uninstall-localdocDATA uninstall-nobase_localdocDATA
|
||||
|
||||
|
||||
# Let automake worry about Makefiles and configure components being up-to-
|
||||
# date.
|
||||
#
|
||||
#
|
||||
# The following rules insure that the Makefile is up-to-date by rerunning
|
||||
# various autoconf components (although not all versions of make assume
|
||||
# that the makefile is implicitly a target). We use time stamp files to
|
||||
# keep track of the most recent update of H5config.h.in and H5config.h
|
||||
# because autoheader and config.status don't update the modification time
|
||||
# if the contents don't change.
|
||||
# Invoke it by "gmake reconfigure".
|
||||
#
|
||||
# Graphically, the dependencies are:
|
||||
#
|
||||
# configure.in
|
||||
# | |
|
||||
# +-----------------+ +------------+
|
||||
# | |
|
||||
# stamp1 configure
|
||||
# (H5config.h.in) |
|
||||
# | | |
|
||||
# | +---------------+ +-----------+
|
||||
# | | |
|
||||
# | config.status
|
||||
# | |
|
||||
# | +------------------+
|
||||
# | |
|
||||
# stamp2
|
||||
# (H5config.h) Makefile.in et al
|
||||
# | |
|
||||
# +------------------+ +-----------+
|
||||
# | |
|
||||
# Makefile
|
||||
#
|
||||
# A side effect of updating stamp1 is to generate H5config.h.in and a
|
||||
# side effect of updating stamp2 is to generate H5config.h. When using
|
||||
# a version of make that doesn't treat the makefile as the initial target
|
||||
# the user may want to occassionally type `make Makefile' in any source
|
||||
# directory.
|
||||
# The `Makefile' target has been renamed to `reconfigure' so that the
|
||||
# autoconf and make depend processes do not start up automatically.
|
||||
# One must do `make reconfigure' explicitedly to start the process.
|
||||
# (When srcdir is used and if more than one machines are running,
|
||||
# this automatic Makefile/autoconf can get things unstable.)
|
||||
#
|
||||
#STAMP1=$(top_builddir)/config/stamp1
|
||||
#STAMP2=$(top_builddir)/config/stamp2
|
||||
|
||||
#MAKEFILE_PARTS=$(srcdir)/Makefile.in \
|
||||
# $(top_srcdir)/config/commence.am \
|
||||
# $(top_srcdir)/config/conclude.am
|
||||
|
||||
#$(STAMP1): $(top_srcdir)/configure.in
|
||||
# touch $(STAMP1)
|
||||
# -cd $(top_srcdir); autoheader
|
||||
|
||||
#$(STAMP2): $(STAMP1) $(top_builddir)/config.status
|
||||
# touch $(STAMP2)
|
||||
# -cd $(top_builddir); \
|
||||
# CONFIG_FILES= CONFIG_HEADERS=src/H5config.h ./config.status
|
||||
|
||||
# Automake supplies a rule to generate configure
|
||||
|
||||
#$(top_builddir)/config.status: $(top_srcdir)/configure $(STAMP1)
|
||||
# -cd $(top_builddir); ./config.status --recheck
|
||||
|
||||
# rerun the autoconf process if any configure components have changed.
|
||||
#reconfigure: $(MAKEFILE_PARTS) $(STAMP2)
|
||||
# -cd $(top_builddir); CONFIG_HEADERS= ./config.status
|
||||
# @for sub in @subdirs@ dummy; do \
|
||||
# if test $$sub != dummy; then \
|
||||
# -cd $$sub; $(MAKE) reconfigure; \
|
||||
# fi; \
|
||||
# done;
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# The following section of this makefile comes from the middle of
|
||||
# `Makefile.am' from this directory.
|
||||
# It was generated by running automake on `Makefile.am' to create
|
||||
# `Makefile.in', then running `config.status' to create this Makefile.
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
# Ignore most rules
|
||||
lib progs check test _test:
|
||||
@echo "Nothing to be done"
|
||||
|
||||
Reference in New Issue
Block a user