summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1999-03-19 20:09:50 (GMT)
committerRobb Matzke <matzke@llnl.gov>1999-03-19 20:09:50 (GMT)
commitb93c9e2cf93cfa61eb6200e8be9a444f44fe1e86 (patch)
tree48e3d92a37120aceac6257cfa018815d472e100b /config
parent19e5077f7f3831e7461e5ba5619906063e083cc9 (diff)
downloadhdf5-b93c9e2cf93cfa61eb6200e8be9a444f44fe1e86.zip
hdf5-b93c9e2cf93cfa61eb6200e8be9a444f44fe1e86.tar.gz
hdf5-b93c9e2cf93cfa61eb6200e8be9a444f44fe1e86.tar.bz2
[svn-r1151] Changes since 19990318
---------------------- ./Makefile.in ./configure.in ./configure [REGENERATED] ./src/H5config.h.in [REGENERATED] ./config/commence.in ./config/conclude.in ./config/dec-osf4.x ./config/depend.in ./config/freebsd ./config/linux-gnu ./config/linux-gnulibc1 ./config/linux-gnulibc2 ./config/solaris2.x ./examples/Makefile.in ./src/Makefile.in ./test/Makefile.in ./testpar/Makefile.in ./tools/Makefile.in ./tools/testh5dump.sh Changes that allow hdf5 to be configured and compiled in a directory other than the source directory. This is especially useful if you want to concurrently compile with different compilers and/or compile flags, or if the hdf5 source is on read-only media like a CDROM. The changes were surprisingly easy ;-) Here's what you can do now... $ mkdir /tmp/build1 # or something $ cd /tmp/build1 $ /cdrom/hdf5/configure # where ever the source is $ make Paul, you'll have to change the testh5toh4 script similar to the way I changed testh5dump.sh. I started working on it but then gave up because of a number of problems: (1) I had to comment out all the tests that let h5toh4 choose the output file name because it always tried to put the output file in the same directory as the input file, (2) if path names are used during the h4 dump then they interfere with the diff. The test works fine when run in the source directory, but try this instead: $ gunzip <hdf5-1.1.67.tar.gz |tar xf - $ chmod -R ugo-w hdf5-1.1.67 $ mkdir build $ cd build $ ../hdf5-1.1.67/configure $ make check Dan, I didn't modify the pablo/Makefile.in because I have no way to test it. I think all you need to do is add a couple lines before the @COMMENCE@ line and add a couple search directories for header files. Anyway, it seems like almost an exact duplicate of the src/Makefile.in, so it shouldn't be a problem... ./Makefile.in Removes a few more temporary files during make clean and distclean. ./configure.in I fixed the creation of the time-stamp files so that the initial make doesn't have to regenerated all the makefiles (only GNU make users will see any change). ./src/H5R.c Changed a return type from `intn' to `int' for an API function. ./src/H5detect.c Added the volatile qualifier to a couple more variables. ./tools/h5tools.c Fixed a compiler warning about an unused local. ./tools/h5toh4.c Initialized `optind' to 1 because it's zero on my system. It should always be one on a unix system. ./tools/testh5toh4 Redirected "broken pipe" messages to /dev/null so outut is formatted correctly.
Diffstat (limited to 'config')
-rw-r--r--config/commence.in40
-rw-r--r--config/conclude.in11
-rw-r--r--config/dec-osf4.x4
-rw-r--r--config/depend.in6
-rw-r--r--config/freebsd2
-rw-r--r--config/linux-gnu2
-rw-r--r--config/linux-gnulibc12
-rw-r--r--config/linux-gnulibc22
-rw-r--r--config/solaris2.x2
9 files changed, 38 insertions, 33 deletions
diff --git a/config/commence.in b/config/commence.in
index 3becee3..41103bc 100644
--- a/config/commence.in
+++ b/config/commence.in
@@ -29,7 +29,6 @@ RUNTEST=$(RUNSERIAL)
TRACE=:
# Installation points
-ROOT=@ROOT@
prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
@@ -37,7 +36,7 @@ libdir=@libdir@
includedir=@includedir@
# Shared libraries
-LT=$(top_srcdir)/libtool
+LT=$(top_builddir)/libtool
LT_COMPILE=$(LT) --mode=compile $(CC)
LT_LINK_LIB=$(LT) --mode=link $(CC) -rpath $(libdir)
LT_LINK_EXE=$(LT) --mode=link $(CC)
@@ -86,30 +85,31 @@ all:
# the user may want to occassionally type `make Makefile' in any source
# directory.
#
-STAMP1=$(ROOT)/config/stamp1
-STAMP2=$(ROOT)/config/stamp2
+STAMP1=$(top_builddir)/config/stamp1
+STAMP2=$(top_builddir)/config/stamp2
-MAKEFILE_PARTS=$(ROOT)/config/commence.in Makefile.in \
- $(ROOT)/config/conclude.in $(ROOT)/config/depend.in
+MAKEFILE_PARTS=$(srcdir)/Makefile.in \
+ $(top_srcdir)/config/commence.in \
+ $(top_srcdir)/config/conclude.in \
+ $(top_srcdir)/config/depend.in
-$(STAMP1): $(ROOT)/configure.in
- -(cd $(ROOT); \
- touch $(STAMP1); \
- autoheader)
+$(STAMP1): $(top_srcdir)/configure.in
+ touch $(STAMP1)
+ -cd $(top_srcdir); autoheader
-$(STAMP2): $(STAMP1) $(ROOT)/config.status
- -(cd $(ROOT); \
- touch $(STAMP2); \
- CONFIG_FILES= CONFIG_HEADERS=src/H5config.h ./config.status)
+$(STAMP2): $(STAMP1) $(top_builddir)/config.status
+ touch $(STAMP2)
+ -cd $(top_builddir); \
+ CONFIG_FILES= CONFIG_HEADERS=src/H5config.h ./config.status
-$(ROOT)/configure: $(ROOT)/configure.in
- -(cd $(ROOT); autoconf)
+$(top_srcdir)/configure: $(top_srcdir)/configure.in
+ -cd $(top_srcdir); autoconf
-$(ROOT)/config.status: $(ROOT)/configure
- -(cd $(ROOT); ./config.status --recheck)
+$(top_srcdir)/config.status: $(top_builddir)/configure
+ -cd $(top_builddir); ./config.status --recheck
-Makefile: $(MAKEFILE_PARTS) $(ROOT)/config.status $(STAMP2)
- -(cd $(ROOT); CONFIG_HEADERS= ./config.status)
+Makefile: $(MAKEFILE_PARTS) $(top_builddir)/config.status $(STAMP2)
+ -cd $(top_builddir); CONFIG_HEADERS= ./config.status
#------------------------------------------------------------------------------
# The following section of this makefile comes from the middle of `Makefile.in'
diff --git a/config/conclude.in b/config/conclude.in
index 2f55ede..3b82c06 100644
--- a/config/conclude.in
+++ b/config/conclude.in
@@ -26,7 +26,9 @@ check test _test: tests
echo "============================"; \
echo "Testing $$test $(TEST_FLAGS)"; \
echo "============================"; \
- $(RUNTEST) ./$$test $(TEST_FLAGS) || exit 1; \
+ PATH=".:$$PATH" srcdir=$(srcdir) \
+ $(RUNTEST) $$test $(TEST_FLAGS) || \
+ exit 1; \
echo ""; \
fi; \
done;
@@ -35,7 +37,9 @@ check test _test: tests
echo "============================"; \
echo "Testing $$test $(TEST_FLAGS)"; \
echo "============================"; \
- $(RUNTEST) /bin/sh ./$$test $(TEST_FLAGS) || exit 1; \
+ srcdir=$(srcdir) \
+ $(RUNTEST) /bin/sh $$test $(TEST_FLAGS) || \
+ exit 1; \
echo ""; \
fi; \
done;
@@ -99,10 +103,11 @@ clean: mostlyclean
#
distclean: clean
-$(RM) .depend TAGS *~ core *.core *.bak *.old *.new $(DISTCLEAN)
- @if test -f Makefile.in; then \
+ @if test -f $(srcdir)/Makefile.in; then \
(set -x; $(RM) Makefile); \
fi
+
# Like `distclean' except it deletes all files that can be regenerated from
# the makefile, including those generated from autoheader and autoconf.
#
diff --git a/config/dec-osf4.x b/config/dec-osf4.x
index fcfc0e3..bad4669 100644
--- a/config/dec-osf4.x
+++ b/config/dec-osf4.x
@@ -13,8 +13,8 @@ if test "X-" = "X-$CC"; then
fi
# Try GNU compiler flags.
-. ./config/gnu-flags
+. $srcdir/config/gnu-flags
# Try native DEC compiler
ARCH=${ARCH:='-arch host -tune host'}
-. ./config/dec-flags
+. $srcdir/config/dec-flags
diff --git a/config/depend.in b/config/depend.in
index 07d0245..dc72d74 100644
--- a/config/depend.in
+++ b/config/depend.in
@@ -25,7 +25,7 @@ dep depend: .distdep
.distdep: .depend
touch .distdep
- -perl -p $(ROOT)/bin/distdep .depend >.distdep
+ -srcdir=$(srcdir) perl -p $(top_srcdir)/bin/distdep .depend >.distdep
.depend: $(LIB_SRC) $(TEST_SRC) $(PROG_SRC)
@touch .depend
@@ -33,12 +33,12 @@ dep depend: .distdep
if [ $$dep != "dummy" ]; then \
echo Building dependencies for $$dep; \
obj=`echo $$dep | sed 's/\.c/\\\\.o/'`; \
- sed "/$$obj/,/[^\\]$$/d" <$@ >$@- && mv $@- $@; \
+ sed '\%$$obj%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \
$(TRACE) $$dep; \
$(CC) -M -MG $(CPPFLAGS) $$dep >>$@; \
fi; \
done;
- -perl -p $(ROOT)/bin/distdep .depend >.distdep
+ -perl -p $(top_srcdir)/bin/distdep .depend >.distdep
-include .depend
diff --git a/config/freebsd b/config/freebsd
index 4d9d221..8608a85 100644
--- a/config/freebsd
+++ b/config/freebsd
@@ -18,4 +18,4 @@ ARCH=
NOFP=${NOFP:=-fomit-frame-pointer}
# Figure out compiler flags
-. ./config/gnu-flags
+. $srcdir/config/gnu-flags
diff --git a/config/linux-gnu b/config/linux-gnu
index 99335aa..d139966 100644
--- a/config/linux-gnu
+++ b/config/linux-gnu
@@ -1,4 +1,4 @@
# -*- shell-script -*-
# This is the same as linux-gnulibc1
-. config/linux-gnulibc1
+. $srcdir/config/linux-gnulibc1
diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1
index 83389b0..266cd3a 100644
--- a/config/linux-gnulibc1
+++ b/config/linux-gnulibc1
@@ -19,4 +19,4 @@ ARCH=${ARCH:="-mcpu=pentiumpro -march=pentiumpro -malign-double"}
NOFP=${NOFP:=-fomit-frame-pointer}
# Figure out compiler flags
-. ./config/gnu-flags
+. $srcdir/config/gnu-flags
diff --git a/config/linux-gnulibc2 b/config/linux-gnulibc2
index 67bdfdd..4551fb6 100644
--- a/config/linux-gnulibc2
+++ b/config/linux-gnulibc2
@@ -7,4 +7,4 @@
# See BlankForm in this directory for details.
# Same as with gnulibc1 for now
-. ./config/linux-gnulibc1
+. $srcdir/config/linux-gnulibc1
diff --git a/config/solaris2.x b/config/solaris2.x
index 2ced6cb..7dc50e4 100644
--- a/config/solaris2.x
+++ b/config/solaris2.x
@@ -13,7 +13,7 @@ if test "X-" = "X-$CC"; then
fi
# Try gcc compiler flags
-. ./config/gnu-flags
+. $srcdir/config/gnu-flags
# Try solaris native compiler flags
if test "X-" = "X-$cc_flags_set"; then