Skip to content

Fix some issues with Makefiles mentioned in #294 #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 18, 2021
Merged

Fix some issues with Makefiles mentioned in #294 #301

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2612d45
Clean generated .f90 files with make
jvdp1 Jan 17, 2021
3e988de
add dependency to common.fypp
jvdp1 Jan 17, 2021
2381809
Update src/Makefile.manual
jvdp1 Jan 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 25 additions & 35 deletions src/Makefile.manual
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,35 @@
SRCFYPP =\
stdlib_bitsets_64.fypp \
stdlib_bitsets_large.fypp \
stdlib_bitsets.fypp \
stdlib_io.fypp \
stdlib_linalg.fypp \
stdlib_linalg_diag.fypp \
stdlib_optval.fypp \
stdlib_quadrature.fypp \
stdlib_quadrature_trapz.fypp \
stdlib_quadrature_simps.fypp \
stdlib_stats.fypp \
stdlib_stats_corr.fypp \
stdlib_stats_cov.fypp \
stdlib_stats_mean.fypp \
stdlib_stats_moment.fypp \
stdlib_stats_moment_all.fypp \
stdlib_stats_moment_mask.fypp \
stdlib_stats_moment_scalar.fypp \
stdlib_stats_var.fypp

SRC = f18estop.f90 \
stdlib_ascii.f90 \
stdlib_bitsets.f90 \
stdlib_bitsets_64.f90 \
stdlib_bitsets_large.f90 \
stdlib_error.f90 \
stdlib_io.f90 \
stdlib_kinds.f90 \
stdlib_linalg.f90 \
stdlib_linalg_diag.f90 \
stdlib_logger.f90 \
stdlib_optval.f90 \
stdlib_quadrature.f90 \
stdlib_quadrature_trapz.f90 \
stdlib_stats.f90 \
stdlib_stats_mean.f90 \
stdlib_stats_moment.f90 \
stdlib_stats_moment_all.f90 \
stdlib_stats_moment_mask.f90 \
stdlib_stats_moment_scalar.f90 \
stdlib_stats_var.f90
$(SRCGEN)

LIB = libstdlib.a



SRCGEN = $(SRCFYPP:.fypp=.f90)
OBJS = $(SRC:.f90=.o)
MODS = $(OBJS:.o=.mod)
SMODS = $(OBJS:.o=*.smod)
Expand All @@ -36,12 +42,12 @@ $(LIB): $(OBJS)
ar rcs $@ $(OBJS)

clean:
$(RM) $(LIB) $(OBJS) $(MODS) $(SMODS)
$(RM) $(LIB) $(OBJS) $(MODS) $(SMODS) $(SRCGEN)

%.o: %.f90
$(FC) $(FFLAGS) -c $<

%.f90: %.fypp
$(SRCGEN): %.f90: %.fypp common.fypp
fypp $(FYPPFLAGS) $< $@

# Fortran module dependencies
Expand Down Expand Up @@ -70,19 +76,3 @@ stdlib_stats_var.o: \
stdlib_optval.o \
stdlib_kinds.o \
stdlib_stats.o

# Fortran sources that are built from fypp templates
stdlib_bitsets_64.f90: stdlib_bitsets_64.fypp
stdlib_bitsets_large.f90: stdlib_bitsets_large.fypp
stdlib_bitsets.f90: stdlib_bitsets.fypp
stdlib_io.f90: stdlib_io.fypp
stdlib_linalg.f90: stdlib_linalg.fypp
stdlib_linalg_diag.f90: stdlib_linalg_diag.fypp
stdlib_quadrature.f90: stdlib_quadrature.fypp
stdlib_stats.f90: stdlib_stats.fypp
stdlib_stats_mean.f90: stdlib_stats_mean.fypp
stdlib_stats_moment.f90: stdlib_stats_moment.fypp
stdlib_stats_moment_all.f90: stdlib_stats_moment_all.fypp
stdlib_stats_moment_mask.f90: stdlib_stats_moment_mask.fypp
stdlib_stats_moment_scalar.f90: stdlib_stats_moment_scalar.fypp
stdlib_stats_var.f90: stdlib_stats_var.fypp