fixes for building outside source tree

This commit is contained in:
2013-05-02 14:14:26 +00:00
parent 78078c322e
commit f17f1d028c
9 changed files with 43 additions and 57 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
AM_CPPFLAGS += -I${abs_top_builddir}/src/include
FFLAGS += -cpp $(AM_CPPFLAGS)
LDFLAGS += -L${abs_top_builddir}/src/lib
AM_LDFLAGS += -L${abs_top_builddir}/src/lib
LDADD =
+5 -7
View File
@@ -1,13 +1,9 @@
AM_CPPFLAGS += -I${abs_top_builddir}/src/include
FFLAGS += -cpp $(AM_CPPFLAGS)
LDFLAGS += -L${abs_top_builddir}/src/lib
AM_LDFLAGS += -L${abs_top_builddir}/src/lib
LDADD =
if ENABLE_C
LDADD +=
endif
if ENABLE_FORTRAN
LDADD += -lH5hutF
endif
@@ -17,19 +13,21 @@ LDADD += -lH5hut
noinst_PROGRAMS =
if ENABLE_C
noinst_PROGRAMS += read_write
noinst_PROGRAMS += \
fields \
read_write
endif
if ENABLE_FORTRAN
noinst_PROGRAMS += H5BlockExampleF
endif
fields_SOURCES = fields.c
read_write_SOURCES = read_write.c
H5BlockExampleF_SOURCES = H5BlockExampleF.f90
%.o : %.f90
$(FC) $(FFLAGS) -c $<
distclean-local:
$(RM) *~
+9 -5
View File
@@ -1,10 +1,14 @@
# test level Makefile.am
AM_CPPFLAGS += -I${abs_top_builddir}/src/include
FFLAGS += -cpp $(AM_CPPFLAGS)
AM_LDFLAGS += -L${abs_top_builddir}/src/lib
OBJEXT = o
LDADD =
AM_LDFLAGS = -L../../src/lib @LDFLAGS@
LIBS = -lH5hut @LIBS@
AM_CPPFLAGS = -I../../src/include @AM_CPPFLAGS@
if ENABLE_FORTRAN
LDADD += -lH5hutF
endif
LDADD += -lH5hut
noinst_PROGRAMS = \
tetmesh_write \
+3 -1
View File
@@ -1,6 +1,6 @@
AM_CPPFLAGS += -I${abs_top_builddir}/src/include
FFLAGS += -cpp $(AM_CPPFLAGS)
LDFLAGS += -L${abs_top_builddir}/src/lib
AM_LDFLAGS += -L${abs_top_builddir}/src/lib
LDADD =
@@ -21,6 +21,7 @@ noinst_PROGRAMS += \
Bench \
H5test \
core_vfd \
particles \
read_canonicalview \
write_setnumparticles \
write_setview
@@ -35,6 +36,7 @@ EXTRA_PROGRAMS = Bench H5test H5testF
Bench_SOURCES = Bench.c
H5test_SOURCES = H5test.c
core_vfd_SOURCES = core_vfd.c
particles_SOURCES = particles.c
read_canonicalview_SOURCES = read_canonicalview.c
write_setnumparticles_SOURCES = write_setnumparticles.c
write_setview_SOURCES = write_setview.c