diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2010-03-30 18:54:15 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2010-03-30 18:54:15 (GMT) |
| commit | 5d1838beab77a93f29ac0278ed43f9d1aec505b7 (patch) | |
| tree | 76fcb069e95a83a4956ce2be399f4dd9fe7627c1 /src/Makefile.in | |
| parent | c49b97ff38ed25d5bb85225dc16059b0a8a5b774 (diff) | |
| download | hdf5-5d1838beab77a93f29ac0278ed43f9d1aec505b7.zip hdf5-5d1838beab77a93f29ac0278ed43f9d1aec505b7.tar.gz hdf5-5d1838beab77a93f29ac0278ed43f9d1aec505b7.tar.bz2 | |
[svn-r18469] bug fix:
recent changes to the embedded library generation code does not quite work
for the AIX system. The strings command of AIX does not display the embedded
library information be default.
Solution:
Changed the H5libhhdf5_setting[] to be an extern variable. Also removed the
const qualifier so that strings can see the variable data.
Tested:
Blue-print (with embedded-libinfo enabled and disabled).
Also tested in Jam.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index ac8e2af..8940219 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -454,7 +454,7 @@ lib_LTLIBRARIES = libhdf5.la libhdf5_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) # H5Tinit.c is a generated file, and should be cleaned. -MOSTLYCLEANFILES = H5Tinit.c H5lib_settings.h +MOSTLYCLEANFILES = H5Tinit.c H5lib_settings.c # H5pubconf.h is generated by configure, and should be cleaned. DISTCLEANFILES = H5pubconf.h @@ -1249,17 +1249,17 @@ H5Tinit.c: H5detect$(EXEEXT) (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ ($(RM) $@ ; exit 1) -H5.o H5.lo: H5lib_settings.h +H5.o H5.lo: H5lib_settings.c # Build configuration header file generation # The LD_LIBRARY_PATH setting is a kludge. # Things should have been all set during H5make_libsettings making. # Remove the generated .h file if errors occur unless HDF5_Make_Ignore # is set to ignore the error. -H5lib_settings.h: H5make_libsettings$(EXEEXT) libhdf5.settings +H5lib_settings.c: H5make_libsettings$(EXEEXT) libhdf5.settings LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \ sed -e 's/-L/:/g' -e 's/ //g'`" \ - $(RUNSERIAL) ./H5make_libsettings$(EXEEXT) > H5lib_settings.h || \ + $(RUNSERIAL) ./H5make_libsettings$(EXEEXT) > H5lib_settings.c || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ ($(RM) $@ ; exit 1) |