diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-17 21:38:20 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-17 21:38:20 (GMT) |
| commit | fd547cd11ffa59c66aa93a5c55f6b979792e76d7 (patch) | |
| tree | fcca518af22b90099a766da4419e593d373cd390 /src | |
| parent | 8a14f5dc0ecf2a550916d5fd8ff5804d6e641240 (diff) | |
| download | hdf5-fd547cd11ffa59c66aa93a5c55f6b979792e76d7.zip hdf5-fd547cd11ffa59c66aa93a5c55f6b979792e76d7.tar.gz hdf5-fd547cd11ffa59c66aa93a5c55f6b979792e76d7.tar.bz2 | |
[svn-r18413] Description:
Unify srcdir handling for test executables and allow them to use the srcdir
setting from configure time without requiring the 'srcdir' environment variable
be set (although you still can, to override the built in setting). Attempted
to get this right for Windows builds also.
Also add dependency between src/H5Tinit.c and src/libhdf5.settings, so
that the test/testcheck_version.sh script works correctly.
Tested on:
Linux/32 2.6 (jam)
Mac OS X/32 10.6.2 (amazon)
Diffstat (limited to 'src')
| -rwxr-xr-x | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 494f370..da81ee2 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -127,7 +127,7 @@ settings_DATA=libhdf5.settings # Things should have been all set during H5detect making. # Remove the generated .c file if errors occur unless HDF5_Make_Ignore # is set to ignore the error. -H5Tinit.c: H5detect$(EXEEXT) +H5Tinit.c: H5detect$(EXEEXT) libhdf5.settings LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \ sed -e 's/-L/:/g' -e 's/ //g'`" \ $(RUNSERIAL) ./H5detect$(EXEEXT) > H5Tinit.c || \ diff --git a/src/Makefile.in b/src/Makefile.in index ee4a86b..b1bc85f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1235,7 +1235,7 @@ help: # Things should have been all set during H5detect making. # Remove the generated .c file if errors occur unless HDF5_Make_Ignore # is set to ignore the error. -H5Tinit.c: H5detect$(EXEEXT) +H5Tinit.c: H5detect$(EXEEXT) libhdf5.settings LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \ sed -e 's/-L/:/g' -e 's/ //g'`" \ $(RUNSERIAL) ./H5detect$(EXEEXT) > H5Tinit.c || \ |