summaryrefslogtreecommitdiffstats
path: root/hl/tools/gif2h5/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'hl/tools/gif2h5/Makefile.in')
-rw-r--r--hl/tools/gif2h5/Makefile.in19
1 files changed, 4 insertions, 15 deletions
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index 884b7ba..f24e02c 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -29,18 +29,6 @@
#
# HDF5 Library Makefile(.in)
#
-
-#------------------------------------------------------------ -*- makefile -*-
-# The following section of this makefile comes from the
-# `./config/commence' file which was generated with config.status
-# from `./config/commence.in'.
-#-----------------------------------------------------------------------------
-
-#------------------------------------------------------------ -*- makefile -*-
-# The following section of this makefile comes from the
-# `./config/conclude' file which was generated with config.status
-# from `./config/conclude.in'.
-#-----------------------------------------------------------------------------
SHELL = @SHELL@
srcdir = @srcdir@
@@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake
AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
AR = @AR@
AS = @AS@
AWK = @AWK@
@@ -511,10 +500,10 @@ build-progs: $(LIB) $(PROGS)
build-tests: $(LIB) $(PROGS) $(TESTS)
lib progs tests ::
- @$(MAKE) build-$@ || exit 1; \
+ @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \
for d in X $(SUBDIRS); do \
if test $$d != X -a $$d != .; then \
- (set -x; cd $$d && $(MAKE) $@) || exit 1; \
+ (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
fi; \
done
@@ -621,7 +610,7 @@ check-vfd:
echo "============================"; \
echo "Testing Virtual File Driver $$vfd"; \
echo "============================"; \
- HDF5_DRIVER=$$vfd $(MAKE) check; \
+ HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \
fi; \
done
# Tell versions [3.59,3.63) of GNU make to not export all variables.
te3?id=b52312923bee35b86fc072ec546cc3e588ae64c9'>#15545: fix sqlite3.iterdump regression on unsortable row_factory objects.R David Murray2013-01-102-1/+23 | | | | | | | | | | | | | | | | | | The fix for issue 9750 introduced a regression by sorting the row objects returned by fetchall. But if a row_factory such as sqlite3.Row is used, the rows may not be sortable (in Python3), which leads to an exception. The sorting is still a nice idea, so the patch moves the sort into the sql. Fix and test by Peter Otten. * | Merge branch '3.2'Petri Lehtinen2012-02-211-0/+18 |\ \ | |/ | | | | Closes #8033. | * sqlite3: Fix 64-bit integer handling in user functions on 32-bit architecturesPetri Lehtinen2012-02-211-0/+18 | | | | | | | | Closes #8033. * | Merge branch '3.2'Petri Lehtinen2012-02-171-0/+1 |\ \ | |/ | | | | Closes #11689. | * Fix a variable scoping error in an sqlite3 testPetri Lehtinen2012-02-171-0/+1 | | | | | | | | Closes #11689. * | Merge branch '3.2'Petri Lehtinen2012-02-122-22/+36 |\ \ | |/ | | | | Closes #9750 | * Fix sqlite3.Connection.iterdump on tables/fields with reserved names or quotesPetri Lehtinen2012-02-122-22/+36 | | | | | | | | Closes #9750 | * Issue #10811: Fix recursive usage of cursors. Instead of crashing, raise a ↵Petri Lehtinen2012-02-061-0/+22 | | | | | | | | ProgrammingError now. * | Undocument and clean up sqlite3.OptimizedUnicodePetri Lehtinen2012-02-091-0/+2 | | | | | | | | Closes #13921. * | Make sqlite3 tests editable with EmacsPetri Lehtinen2012-02-027-7/+7 | | | | | | | | | | Change the coding declaration from ISO-8859-1 to iso-8859-1. Emacs doesn't understand the former. * | Merge branch 3.2Petri Lehtinen2012-02-01