summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-02-03 21:59:40 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-02-03 21:59:40 (GMT)
commitdb2575baa91049ad4d5e5ea623ff1161443d1af2 (patch)
treec4169fb6dc29ddbcd8bc356afb98b708c96374dd /c++
parent51863989304a051ac6306c8c49c34d70a4cf992e (diff)
downloadhdf5-db2575baa91049ad4d5e5ea623ff1161443d1af2.zip
hdf5-db2575baa91049ad4d5e5ea623ff1161443d1af2.tar.gz
hdf5-db2575baa91049ad4d5e5ea623ff1161443d1af2.tar.bz2
[svn-r9930]
Purpose: Bug fix Description: Parallel builds were breaking in tools/lib Solution: talign didn't realize it depended on libh5tools.la because its dependencies listed the full path (../../tools/lib/libh5tools.la). Changed this, and made similar changes in a couple of other directories. This checkin should also add the --foreign flag to every Makefile.in Platforms tested: sleipnir (minor change)
Diffstat (limited to 'c++')
-rw-r--r--c++/Makefile.in2
-rw-r--r--c++/examples/Makefile.in2
-rw-r--r--c++/src/Makefile.in2
-rw-r--r--c++/test/Makefile.in2
4 files changed, 4 insertions, 4 deletions
diff --git a/c++/Makefile.in b/c++/Makefile.in
index d65d69e..43cac76 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -231,7 +231,7 @@ all: all-recursive
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu c++/Makefile
+ $(AUTOMAKE) --foreign c++/Makefile
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index fd7c650..638cec6 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -249,7 +249,7 @@ all: all-am
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu c++/examples/Makefile
+ $(AUTOMAKE) --foreign c++/examples/Makefile
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index af4ea86..ecb530d 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -315,7 +315,7 @@ all: all-am
.SUFFIXES: .cpp .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu c++/src/Makefile
+ $(AUTOMAKE) --foreign c++/src/Makefile
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
h5c++: $(top_builddir)/config.status h5c++.in
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index 9863440..13ffb33 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -275,7 +275,7 @@ all: all-am
.SUFFIXES: .cpp .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu c++/test/Makefile
+ $(AUTOMAKE) --foreign c++/test/Makefile
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)