diff options
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/lib/Makefile.in | 25 |
2 files changed, 9 insertions, 18 deletions
diff --git a/tools/lib/Makefile.am b/tools/lib/Makefile.am index 4527820..dad3db3 100644 --- a/tools/lib/Makefile.am +++ b/tools/lib/Makefile.am @@ -20,7 +20,7 @@ include $(top_srcdir)/config/commence.am # Include files in /src directory -INCLUDES+=-I$(top_srcdir)/src +INCLUDES=-I$(top_srcdir)/src # This is our main target, the h5tools library. noinst_LTLIBRARIES=libh5tools.la diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 1f7889c..427c2e1 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -121,8 +121,6 @@ BUILD_PABLO_CONDITIONAL_FALSE = @BUILD_PABLO_CONDITIONAL_FALSE@ BUILD_PABLO_CONDITIONAL_TRUE = @BUILD_PABLO_CONDITIONAL_TRUE@ BUILD_PARALLEL_CONDITIONAL_FALSE = @BUILD_PARALLEL_CONDITIONAL_FALSE@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@ -BUILD_SHARED_ONLY_CONDITIONAL_FALSE = @BUILD_SHARED_ONLY_CONDITIONAL_FALSE@ -BUILD_SHARED_ONLY_CONDITIONAL_TRUE = @BUILD_SHARED_ONLY_CONDITIONAL_TRUE@ BYTESEX = @BYTESEX@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -289,11 +287,6 @@ RM = rm -f CP = cp TIME = time -# Path for hl needed in hdf5.h - -# Include files in /src directory -INCLUDES = -I$(top_srcdir)/hl/src -I$(top_srcdir)/src - # Some machines need a command to run executables; this is that command # so that our tests will run. # We use RUNTESTS instead of RUNSERIAL directly because it may be that @@ -314,20 +307,15 @@ LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la docdir = $(exec_prefix)/doc -@BUILD_SHARED_ONLY_CONDITIONAL_FALSE@H5CC = $(bindir)/h5cc # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -@BUILD_SHARED_ONLY_CONDITIONAL_TRUE@H5CC = $(bindir)/h5cc -shlib -@BUILD_SHARED_ONLY_CONDITIONAL_FALSE@H5CC_PP = $(bindir)/h5pcc -@BUILD_SHARED_ONLY_CONDITIONAL_TRUE@H5CC_PP = $(bindir)/h5pcc -shlib -@BUILD_SHARED_ONLY_CONDITIONAL_FALSE@H5FC = $(bindir)/h5fc -@BUILD_SHARED_ONLY_CONDITIONAL_TRUE@H5FC = $(bindir)/h5fc -shlib -@BUILD_SHARED_ONLY_CONDITIONAL_FALSE@H5FC_PP = $(bindir)/h5pfc -@BUILD_SHARED_ONLY_CONDITIONAL_TRUE@H5FC_PP = $(bindir)/h5pfc -shlib -@BUILD_SHARED_ONLY_CONDITIONAL_FALSE@H5CPP = $(bindir)/h5c++ -@BUILD_SHARED_ONLY_CONDITIONAL_TRUE@H5CPP = $(bindir)/h5c++ -shlib +H5CC = $(bindir)/h5cc $(H5CCFLAGS) +H5CC_PP = $(bindir)/h5pcc $(H5CCFLAGS) +H5FC = $(bindir)/h5fc $(H5CCFLAGS) +H5FC_PP = $(bindir)/h5pfc $(H5CCFLAGS) +H5CPP = $(bindir)/h5c++ $(H5CCFLAGS) # The trace script; this is used on source files from the C library to # insert tracing macros. @@ -338,6 +326,9 @@ TRACE = perl $(top_srcdir)/bin/trace # *.clog are from the MPE option. CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# Include files in /src directory +INCLUDES = -I$(top_srcdir)/src + # This is our main target, the h5tools library. noinst_LTLIBRARIES = libh5tools.la libh5tools_la_SOURCES = h5tools.c h5tools_str.c h5tools_utils.c h5diff.c \ |