diff options
Diffstat (limited to 'tools/h5repack/Makefile.in')
| -rw-r--r-- | tools/h5repack/Makefile.in | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 8768d36..7ea6e23 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -21,11 +21,9 @@ srcdir=@srcdir@ ## Add include directory to the C preprocessor flags, add -lh5tools and ## -lhdf5 to the list of libraries. ## Add also the test include directory for #defines -## Add include for H5DIFF CPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/src -I$(top_srcdir)/src \ -I$(top_srcdir)/test \ - -I$(top_srcdir)/tools/lib @CPPFLAGS@ \ - -I$(top_srcdir)/tools/h5diff + -I$(top_srcdir)/tools/lib @CPPFLAGS@ ## Test programs and scripts. ## @@ -35,6 +33,7 @@ TEST_SCRIPTS=$(srcdir)/h5repack.sh ## These are our main targets: library and tools. ## LIBHDF5=$(top_builddir)/src/libhdf5.la +LIBTOOLS=../lib/libh5tools.la PUB_PROGS=h5repack PROGS=$(PUB_PROGS) $(TEST_PROGS) @@ -51,10 +50,10 @@ MOSTLYCLEAN=*.h5 ## Source and object files for programs... ## -PROG_SRC=h5repack.c h5repack_list.c h5repack_main.c h5repack_opttable.c h5repack_parse.c ../h5diff/h5trav.c ../h5diff/h5trav_table.c test_h5repack_add.c test_h5repack_main.c +PROG_SRC=h5repack.c h5repack_list.c h5repack_main.c h5repack_opttable.c h5repack_parse.c test_h5repack_add.c test_h5repack_main.c PROG_OBJ=$(PROG_SRC:.c=.lo) -OBJS=h5repack.lo h5repack_list.lo h5repack_main.lo h5repack_opttable.lo h5repack_parse.lo ../h5diff/h5trav.lo ../h5diff/h5trav_table.lo -TEST_OBJS=../h5diff/h5diff.lo ../h5diff/h5diff_array.lo ../h5diff/h5diff_dset.lo ../h5diff/h5diff_util.lo h5repack.lo h5repack_list.lo h5repack_opttable.lo h5repack_parse.lo ../h5diff/h5trav.lo ../h5diff/h5trav_table.lo test_h5repack_add.lo test_h5repack_main.lo +OBJS=h5repack.lo h5repack_list.lo h5repack_main.lo h5repack_opttable.lo h5repack_parse.lo +TEST_OBJS=h5repack.lo h5repack_list.lo h5repack_opttable.lo h5repack_parse.lo test_h5repack_add.lo test_h5repack_main.lo PRIVATE_HDR= @@ -70,13 +69,13 @@ check test _test: $(PROGS) ## How to build the programs...They all depend on the hdf5 library and ## the tools library compiled in this directory. ## -$(PROGS): $(LIBHDF5) +$(PROGS): $(LIBTOOLS) $(LIBHDF5) h5repack: $(OBJS) - @$(LT_LINK_EXE) $(CFLAGS) -o $@ $(OBJS) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) $(CFLAGS) -o $@ $(OBJS) $(LIBTOOLS) $(LIBHDF5) $(LDFLAGS) $(LIBS) h5repacktst: $(TEST_OBJS) - @$(LT_LINK_EXE) $(CFLAGS) -o $@ $(TEST_OBJS) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) $(CFLAGS) -o $@ $(TEST_OBJS) $(LIBTOOLS) $(LIBHDF5) $(LDFLAGS) $(LIBS) @CONCLUDE@ |