diff options
author | James Laird <jlaird@hdfgroup.org> | 2005-02-01 21:05:33 (GMT) |
---|---|---|
committer | James Laird <jlaird@hdfgroup.org> | 2005-02-01 21:05:33 (GMT) |
commit | e3dacb31be51f135bb2a5ccd59c71eaa38036928 (patch) | |
tree | 94048925e82c37a162fd54cc50941091add113e2 /doc/html/PSandPDF | |
parent | da0e046dce809f5219949f428134d687f37c5d59 (diff) | |
download | hdf5-e3dacb31be51f135bb2a5ccd59c71eaa38036928.zip hdf5-e3dacb31be51f135bb2a5ccd59c71eaa38036928.tar.gz hdf5-e3dacb31be51f135bb2a5ccd59c71eaa38036928.tar.bz2 |
[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)
Diffstat (limited to 'doc/html/PSandPDF')
-rw-r--r-- | doc/html/PSandPDF/Makefile.in | 95 |
1 files changed, 8 insertions, 87 deletions
diff --git a/doc/html/PSandPDF/Makefile.in b/doc/html/PSandPDF/Makefile.in index a06fbc0..02f0169 100644 --- a/doc/html/PSandPDF/Makefile.in +++ b/doc/html/PSandPDF/Makefile.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@ @@ -312,88 +315,6 @@ uninstall-am: uninstall-info-am mostlyclean-libtool uninstall uninstall-am uninstall-info-am -# 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" |