mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-18 15:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r9993] Purpose:

Browse Source 
Bug fix

Description:
Arabica exhibited strange errors when linker found wrong versions of
header files.  This happened because include directories were
given to linker in the wrong order.

Solution:
Move include directories from AM_CFLAGS variable to INCLUDES
variable to put them before CPPFLAGS variable.  Trust me, it works.
This bug may also have contributed to strange errors on other platforms
(kelgia?).

Platforms tested:
copper, sleipnir, arabica.
	(h5dump broke while building on arabica, but this happened in
	a clean checkout, too).
This commit is contained in:
James Laird 2005-02-11 16:32:22 -05:00
parent 791146f98a
commit b96f342722
32 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fortran/src/Makefile.am
View File

@ -21,7 +21,7 @@ include $(top_srcdir)/config/commence.am
# Include src directory in both Fortran and C flags (C compiler is used
# for linking)
AM_CFLAGS = -I$(top_srcdir)/src
INCLUDES = -I$(top_srcdir)/src
AM_FFLAGS=-I$(top_srcdir)/src
# This is our main target, the fortran library

2
fortran/src/Makefile.in
View File

@ -191,7 +191,7 @@ F9XMODFLAG = @F9XMODFLAG@
# Include src directory in both Fortran and C flags (C compiler is used
# for linking)
AM_CFLAGS = -I$(top_srcdir)/src
INCLUDES = -I$(top_srcdir)/src
AM_FFLAGS = -I$(top_srcdir)/src
# This is our main target, the fortran library

8
fortran/test/Makefile.am
View File

@ -21,7 +21,7 @@ include $(top_srcdir)/config/commence.am
# Include files
AM_FFLAGS=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
AM_CFLAGS=-I$(top_srcdir)/src
INCLUDES=-I$(top_srcdir)/src
# The Fortran test library
lib_LTLIBRARIES=libh5test_fortran.la
@ -56,11 +56,11 @@ LDADD=libh5test_fortran.la $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
# Temporary files
MOSTLYCLEANFILES=*.h5 *.tmp
# Fortran dependencies must be hardcoded, unfortunately.
#FORTLIBTEST_OBJ= fortranlib_test.lo \
## Fortran dependencies must be hardcoded, unfortunately.
##FORTLIBTEST_OBJ= fortranlib_test.lo \
tH5F.lo tH5D.lo tH5R.lo tH5S.lo tH5T.lo tH5VL.lo tH5Z.lo \
tH5Sselect.lo tH5P.lo tH5A.lo tH5I.lo tH5G.lo tH5E.lo tf.lo \
t.lo
#fortranlib_test$(EXEEXT): $(FORTLIBTEST_OBJ)
##fortranlib_test$(EXEEXT): $(FORTLIBTEST_OBJ)
include $(top_srcdir)/config/conclude.am

2
fortran/test/Makefile.in
View File

@ -191,7 +191,7 @@ F9XMODFLAG = @F9XMODFLAG@
# Include files
AM_FFLAGS = -I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
AM_CFLAGS = -I$(top_srcdir)/src
INCLUDES = -I$(top_srcdir)/src
# The Fortran test library
lib_LTLIBRARIES = libh5test_fortran.la

2
hl/tools/gif2h5/Makefile.am
View File

@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
# Include src and tools/lib directories
AM_CFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# These are our main targets, the tools
bin_PROGRAMS=gif2h5 h52gif

2
hl/tools/gif2h5/Makefile.in
View File

@ -190,7 +190,7 @@ F9XMODEXT = @F9XMODEXT@
F9XMODFLAG = @F9XMODFLAG@
# Include src and tools/lib directories
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# These are our main targets, the tools
bin_PROGRAMS = gif2h5 h52gif

2
perform/Makefile.am
View File

@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
AM_CFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
if BUILD_PARALLEL_CONDITIONAL
TEST_PROG_PARA=h5perf

2
perform/Makefile.in
View File

@ -189,7 +189,7 @@ H5FC_PP = $(bindir)/h5pfc
F9XMODEXT = @F9XMODEXT@
F9XMODFLAG = @F9XMODFLAG@
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
@BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = h5perf

3
src/Makefile.am
View File

@ -19,9 +19,6 @@
include $(top_srcdir)/config/commence.am
######## Add '-I.' to the C preprocessor flags
#AM_CFLAGS=-I$(srcdir)
# How to build H5detect for number format detection.
# Use -g to force no optimization since many compilers (e.g., Intel) takes
# a long time to compile it with any optimization on. H5detect is used

3
src/Makefile.in
View File

@ -189,9 +189,6 @@ H5FC_PP = $(bindir)/h5pfc
F9XMODEXT = @F9XMODEXT@
F9XMODFLAG = @F9XMODFLAG@
######## Add '-I.' to the C preprocessor flags
#AM_CFLAGS=-I$(srcdir)
# How to build H5detect for number format detection.
# Use -g to force no optimization since many compilers (e.g., Intel) takes
# a long time to compile it with any optimization on. H5detect is used

2
test/Makefile.am
View File

@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
AM_CFLAGS=-I$(top_srcdir)/src
INCLUDES=-I$(top_srcdir)/src -I$(top_builddir)/src
# Test script for error_test and err_compat
TEST_SCRIPT = $(top_srcdir)/test/testerror.sh

2
test/Makefile.in
View File

@ -189,7 +189,7 @@ H5FC_PP = $(bindir)/h5pfc
F9XMODEXT = @F9XMODEXT@
F9XMODFLAG = @F9XMODFLAG@
AM_CFLAGS = -I$(top_srcdir)/src
INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src
# Test script for error_test and err_compat
TEST_SCRIPT = $(top_srcdir)/test/testerror.sh

2
testpar/Makefile.am
View File

@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
AM_CFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/test
INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test
# Test programs and scripts. These are our main targets.
#

2
testpar/Makefile.in
View File

@ -189,7 +189,7 @@ H5FC_PP = $(bindir)/h5pfc
F9XMODEXT = @F9XMODEXT@
F9XMODFLAG = @F9XMODFLAG@
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test
# Test programs and scripts. These are our main targets.
#

2
tools/gifconv/Makefile.am
View File

@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
# Include src and tools/lib directories
AM_CFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# These are our main targets, the tools
bin_PROGRAMS=gif2h5 h52gif

2
tools/gifconv/Makefile.in
View File

@ -190,7 +190,7 @@ F9XMODEXT = @F9XMODEXT@
F9XMODFLAG = @F9XMODFLAG@
# Include src and tools/lib directories
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# These are our main targets, the tools
bin_PROGRAMS = gif2h5 h52gif

2
tools/h5diff/Makefile.am
View File

@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
# Include src and tools/lib directories
AM_CFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# Always build and test h5diff but build and test ph5diff only if parallel
# is enabled.

2
tools/h5diff/Makefile.in
View File

@ -190,7 +190,7 @@ F9XMODEXT = @F9XMODEXT@
F9XMODFLAG = @F9XMODFLAG@
# Include src and tools/lib directories
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# Always build and test h5diff but build and test ph5diff only if parallel
# is enabled.

2
tools/h5dump/Makefile.am
View File

@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
# Include files in /src directory and /tools/lib directory
AM_CFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# Test programs and scripts
TEST_PROG=h5dumpgentest

2
tools/h5dump/Makefile.in
View File

@ -190,7 +190,7 @@ F9XMODEXT = @F9XMODEXT@
F9XMODFLAG = @F9XMODFLAG@
# Include files in /src directory and /tools/lib directory
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# Test programs and scripts
TEST_PROG = h5dumpgentest

2
tools/h5import/Makefile.am
View File

@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
# Include src and tools/lib directories
AM_CFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# Test programs and scripts
TEST_PROG=h5importtest

2
tools/h5import/Makefile.in
View File

@ -190,7 +190,7 @@ F9XMODEXT = @F9XMODEXT@
F9XMODFLAG = @F9XMODFLAG@
# Include src and tools/lib directories
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# Test programs and scripts
TEST_PROG = h5importtest

2
tools/h5jam/Makefile.am
View File

@ -19,7 +19,7 @@
include $(top_srcdir)/config/commence.am
# Include src and tools/lib directories
AM_CFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
bin_PROGRAMS=h5jam h5unjam
check_PROGRAMS=tellub h5jamgentest getub

2
tools/h5jam/Makefile.in
View File

@ -190,7 +190,7 @@ F9XMODFLAG = @F9XMODFLAG@
#
# Include src and tools/lib directories
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
bin_PROGRAMS = h5jam h5unjam
check_PROGRAMS = tellub h5jamgentest getub

2
tools/h5ls/Makefile.am
View File

@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
# Include src and tools/lib directories
AM_CFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# Test programs and scripts
TEST_SCRIPT=$(srcdir)/testh5ls.sh

2
tools/h5ls/Makefile.in
View File

@ -190,7 +190,7 @@ F9XMODEXT = @F9XMODEXT@
F9XMODFLAG = @F9XMODFLAG@
# Include src and tools/lib directories
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# Test programs and scripts
TEST_SCRIPT = $(srcdir)/testh5ls.sh

2
tools/h5repack/Makefile.am
View File

@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
# Include src, test, and tools/lib directories
AM_CFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
# Test programs and scripts
TEST_SCRIPT=h5repack.sh

2
tools/h5repack/Makefile.in
View File

@ -190,7 +190,7 @@ F9XMODEXT = @F9XMODEXT@
F9XMODFLAG = @F9XMODFLAG@
# Include src, test, and tools/lib directories
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
# Test programs and scripts
TEST_SCRIPT = h5repack.sh

2
tools/lib/Makefile.am
View File

@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
# Include files in /src directory
AM_CFLAGS=-I$(top_srcdir)/src
INCLUDES=-I$(top_srcdir)/src
# This is our main target, the h5tools library. We link this library
# statically because some systems can only link executables to a single

2
tools/lib/Makefile.in
View File

@ -190,7 +190,7 @@ F9XMODEXT = @F9XMODEXT@
F9XMODFLAG = @F9XMODFLAG@
# Include files in /src directory
AM_CFLAGS = -I$(top_srcdir)/src
INCLUDES = -I$(top_srcdir)/src
# This is our main target, the h5tools library. We link this library
# statically because some systems can only link executables to a single

2
tools/misc/Makefile.am
View File

@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
# Include src directory
AM_CFLAGS=-I$(top_srcdir)/src
INCLUDES=-I$(top_srcdir)/src
# Build pdb2hdf5 if LLNL's PDB is present (checked in configure)
if BUILD_PDB2HDF_CONDITIONAL

2
tools/misc/Makefile.in
View File

@ -190,7 +190,7 @@ F9XMODEXT = @F9XMODEXT@
F9XMODFLAG = @F9XMODFLAG@
# Include src directory
AM_CFLAGS = -I$(top_srcdir)/src
INCLUDES = -I$(top_srcdir)/src
# Build pdb2hdf5 if LLNL's PDB is present (checked in configure)
@BUILD_PDB2HDF_CONDITIONAL_TRUE@PDB2HDF = pdb2hdf5