diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-10-16 18:28:24 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-10-16 18:28:24 (GMT) |
| commit | 75a5c72ace679984de255dcbfad4eaea2ceb5e43 (patch) | |
| tree | ed579265369516084642533c5261476515f9d818 /hl/tools | |
| parent | b780d0d79d9cc198b03952179d283f3aa814f45e (diff) | |
| parent | ae573ecf56160fb3383b4ca7b8811a2085d2762f (diff) | |
| download | hdf5-75a5c72ace679984de255dcbfad4eaea2ceb5e43.zip hdf5-75a5c72ace679984de255dcbfad4eaea2ceb5e43.tar.gz hdf5-75a5c72ace679984de255dcbfad4eaea2ceb5e43.tar.bz2 | |
[svn-r24303] update from VOL branch that has been updated with trunk.
resolve conflicts, etc..
Diffstat (limited to 'hl/tools')
| -rw-r--r-- | hl/tools/Makefile.in | 1 | ||||
| -rw-r--r-- | hl/tools/gif2h5/Makefile.in | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index 3863318..4d8279c 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -257,6 +257,7 @@ LIPO = @LIPO@ LL_PATH = @LL_PATH@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_ADD_LIBHDF5_DEPENDENCY = @LT_ADD_LIBHDF5_DEPENDENCY@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index b0c72f7..972ded3 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -271,6 +271,7 @@ LIPO = @LIPO@ LL_PATH = @LL_PATH@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_ADD_LIBHDF5_DEPENDENCY = @LT_ADD_LIBHDF5_DEPENDENCY@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ |