2ac343e92e
* cosmomc: New package CosmoMC * cosmomc: Improve version numbering scheme * planck-likelihood: New package * cosmomc: Pacify flake8 * cosmomc: Code cleanup as requested in the review * cosmomc: Various updates suggested during review * cosmomc: Limit compiler versions (as documented in the build instructions) * cosmomc: Correct flake8 error * cosmomc: Use `libs` instead of `lapack_libs` * planck-likelihood: Make makefile output more verbose and readable * planck-likelilhood: Correct order of libraries when calling linker * cosmomc: Clean up check for suitable compiler * planck-likelihood: Use modern mechanism to set environment variables
22 lines
995 B
Diff
22 lines
995 B
Diff
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -336,15 +336,15 @@
|
|
|
|
$(BDIR)/libclik_f90.$(SO): $(BDIR)/libclik.$(SO) $(addprefix $(ODIR)/,clik_fortran.o clik.f90.o)
|
|
@$(ECHO) "build $(BLUE_COLOR)$(@) $(NO_COLOR)"
|
|
- @$(LD) $(SHARED) $(LDFLAG) $(LAPACK) -L$(BDIR) -lclik $^ -o $@
|
|
+ @$(LD) -o $@ $(addprefix $(ODIR)/,clik_fortran.o clik.f90.o) -L$(BDIR) -lclik $(SHARED) $(LAPACK) $(LDFLAG)
|
|
|
|
$(BDIR)/clik_example_C: $(ODIR)/clik_example_c.o $(BDIR)/libclik.$(SO)
|
|
@$(ECHO) "build $(BLUE_COLOR)$(@) $(NO_COLOR)"
|
|
- @$(CC) $(LDFLAG) $(LAPACK) -L$(BDIR) -lclik $< -o $@
|
|
+ @$(CC) -o $@ $(ODIR)/clik_example_c.o -L$(BDIR) -lclik $(LAPACK) $(LDFLAG)
|
|
|
|
$(BDIR)/clik_example_f90: $(ODIR)/clik_example_f90.f90.o $(BDIR)/libclik_f90.$(SO)
|
|
@$(ECHO) "build $(BLUE_COLOR)$(@) $(NO_COLOR)"
|
|
- @$(FC) $(LDFLAG) $(LAPACK) -L$(BDIR) -lclik_f90 -lclik $< -o $@
|
|
+ @$(FC) -o $@ $(ODIR)/clik_example_f90.f90.o -L$(BDIR) -lclik_f90 -lclik $(LAPACK) $(LDFLAG)
|
|
|
|
$(BDIR)/liblapack_clik.$(SO): |$(BDIR)
|
|
ifndef MKL_LIB_FULLPATH
|