diff --git a/externals/lhs/Makefile b/externals/lhs/Makefile index 0f770fc..6862a9b 100644 --- a/externals/lhs/Makefile +++ b/externals/lhs/Makefile @@ -1,25 +1,25 @@ -# please change the variables FC and FFLAGS to match your fortran compiler - -CC = icc -CFLAGS=-Wall -Wcheck -Wremarks -std=c99 -g -Ofast -ipo -Xhost -wd981 -openmp -ICC_DISABLE_WARNS=-wd11021 -sources=$(wildcard *.c) -headers=$(wildcard *.h) -objects=$(sources:.c=.o) -libraries=-mkl -lm -lz - -all: $(objects) - -gnu: EXTRA_DEFINE= -gnu: CC=gcc -gnu: ICC_DISABLE_WARNS= -gnu: CFLAGS=-Wall -Wextra -std=c99 -pedantic -O3 -march=native -g -gdwarf-3 -fopenmp -gnu: libraries=-lm -lz -gnu: $(objects) - - -%.o: %.c - $(CC) $(CFLAGS) $(EXTRA_DEFINE) -c $< - -clean: - rm -f *.o +# please change the variables FC and FFLAGS to match your fortran compiler + +CC = icc +CFLAGS=-Wall -Wcheck -Wremarks -std=c99 -g -Ofast -ipo -Xhost -wd981 -qopenmp +ICC_DISABLE_WARNS=-wd11021 +sources=$(wildcard *.c) +headers=$(wildcard *.h) +objects=$(sources:.c=.o) +libraries=-mkl -lm -lz + +all: $(objects) + +gnu: EXTRA_DEFINE= +gnu: CC=gcc +gnu: ICC_DISABLE_WARNS= +gnu: CFLAGS=-Wall -Wextra -std=c99 -pedantic -O3 -march=native -g -gdwarf-3 -fopenmp +gnu: libraries=-lm -lz +gnu: $(objects) + + +%.o: %.c + $(CC) $(CFLAGS) $(EXTRA_DEFINE) -c $< + +clean: + rm -f *.o diff --git a/src/Makefile b/src/Makefile index 8387e5b..b0251f2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,8 +3,7 @@ # 2013, 2014 CC=icc -#CFLAGS=-Wall -Wextra -std=c99 -pedantic -O3 -march=native -g -gdwarf-3 -fopenmp -CFLAGS=-Wall -Wcheck -Wremarks -std=c99 -g -Ofast -ipo -Xhost -wd981 -openmp +CFLAGS=-Wall -Wcheck -Wremarks -std=c99 -g -Ofast -ipo -Xhost -wd981 -qopenmp # -wd981 disables warning about operands evaluated in an unspecified order EXTRA_DEFINE=-DUSE_MKL @@ -13,8 +12,7 @@ ICC_DISABLE_WARNS=-wd11021 sources=$(wildcard *.c) headers=$(wildcard *.h) objects=$(sources:.c=.o) ../externals/newuoa/*.o ../externals/lhs/*.o -#libraries=-mkl -lz -libraries=-mkl -lm -lz -openmp -lifcore +libraries=-mkl -lm -lz -qopenmp -lifcore binaries=neemp manpage=neemp.1