Skip to content

Commit a4382c8

Browse files
authored
Minor update to the autotool commands
1 parent d64f555 commit a4382c8

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

src/Makefile.am

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
AM_FCFLAGS = -fbounds-check -O2 -ffixed-line-length-none -ffree-line-length-none -Wunused -lm -I$(HDF5_INC)
2-
AM_LDFLAGS = -ldl -L$(HDF5_LIB) $(HDF5_LDFLAGS)
1+
AM_FCFLAGS = -I$(HDF5_INC) -fbounds-check -O2 -ffixed-line-length-none -ffree-line-length-none -Wunused -lm -ldl
2+
3+
NHDS_LDADD = -L$(HDF5_LIB) $(HDF5_LDFLAGS)
34

45
bin_PROGRAMS = NHDS
56
NHDS_SOURCES = NHDS.f90 calc_polarization.f90 calc_xi.f90 dispfunct.f90 disptensor.f90 newton_method.f90 parameters.f90 suscep.f90 waveenergy.f90 write_delta_f.f90

src/Makefile.in

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ am_NHDS_OBJECTS = NHDS.$(OBJEXT) calc_polarization.$(OBJEXT) \
103103
newton_method.$(OBJEXT) parameters.$(OBJEXT) suscep.$(OBJEXT) \
104104
waveenergy.$(OBJEXT) write_delta_f.$(OBJEXT)
105105
NHDS_OBJECTS = $(am_NHDS_OBJECTS)
106-
NHDS_LDADD = $(LDADD)
106+
am__DEPENDENCIES_1 =
107+
NHDS_DEPENDENCIES = $(am__DEPENDENCIES_1)
107108
AM_V_P = $(am__v_P_@AM_V@)
108109
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
109110
am__v_P_0 = false
@@ -239,8 +240,8 @@ target_alias = @target_alias@
239240
top_build_prefix = @top_build_prefix@
240241
top_builddir = @top_builddir@
241242
top_srcdir = @top_srcdir@
242-
AM_FCFLAGS = -fbounds-check -O2 -ffixed-line-length-none -ffree-line-length-none -Wunused -lm -I$(HDF5_INC)
243-
AM_LDFLAGS = -ldl -L$(HDF5_LIB) $(HDF5_LDFLAGS)
243+
AM_FCFLAGS = -I$(HDF5_INC) -fbounds-check -O2 -ffixed-line-length-none -ffree-line-length-none -Wunused -lm -ldl
244+
NHDS_LDADD = -L$(HDF5_LIB) $(HDF5_LDFLAGS)
244245
NHDS_SOURCES = NHDS.f90 calc_polarization.f90 calc_xi.f90 dispfunct.f90 disptensor.f90 newton_method.f90 parameters.f90 suscep.f90 waveenergy.f90 write_delta_f.f90
245246
all: all-am
246247

@@ -255,9 +256,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
255256
exit 1;; \
256257
esac; \
257258
done; \
258-
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
259+
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
259260
$(am__cd) $(top_srcdir) && \
260-
$(AUTOMAKE) --foreign src/Makefile
261+
$(AUTOMAKE) --gnu src/Makefile
261262
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
262263
@case '$?' in \
263264
*config.status*) \

0 commit comments

Comments
 (0)