build: updated smeka system

Signed-off-by: Nick Papior <[email protected]>

Author: zerothi

smeka/Makefile.clean

@@ -16,7 +16,7 @@ clean: smeka-clean-src
 
 .PHONY: smeka-clean-mod
 smeka-clean-mod:
-	rm -f $(FMOD_DIR)/*.mod $(FMOD_DIR)/*.MOD
+	rm -f $(F_MODS)
 clean: smeka-clean-mod
 
 .PHONY: smeka-clean-obj

smeka/Makefile.compiler

@@ -98,6 +98,9 @@ FC ?= $(V_FC)
 ifdef V_CPP
 CPP ?= $(V_CPP)
 endif
+ifdef V_FPP
+FPP ?= $(V_FPP)
+endif
 MPICC ?= $(V_MPICC)
 MPICXX ?= $(V_MPICXX)
 MPIFC ?= $(V_MPIFC)
@@ -128,10 +131,10 @@ show: smeka-show-compiler
 # Define the default compilation options:
 ifeq ($(SMEKA_CPP_F),0)
 %.o: %.F90
-	$(FC) -c -o $@ $(FFLAGS) $(CPPFLAGS) $(FPPFLAGS) $(INCLUDES) $<
+	$(FC) -c -o $@ $(FFLAGS) $(INCLUDES) $(FPPFLAGS) $<
 else
 %.o: %.F90
-	$(CPP) $(CPPFLAGS) $(FPPFLAGS) $(INCLUDES) $< > $(<:.F90=_cpp.f90)
+	$(FPP) $(INCLUDES) $(FPPFLAGS) $< > $(<:.F90=_cpp.f90)
 	$(FC) -c -o $@ $(FFLAGS) $(INCLUDES) $(<:.F90=_cpp.f90)
 endif
 %.o: %.f90

smeka/Makefile.install

@@ -12,7 +12,9 @@ install: smeka-install-lib smeka-install
 .PHONY: smeka-install-lib
 .NOTPARALLEL: smeka-install-lib
 smeka-install-lib: smeka-install-init-dir
+ifneq ($(LIBRARIES),)
 	install -pm $(_OCT_rwxrxrx) -t $(LIB_DIR) $(LIBRARIES)
+endif
 
 
 .PHONY: smeka-install-init-dir

smeka/vendor/clang.make

@@ -8,6 +8,7 @@ V_CXX = clang
 # What to do here?
 V_FC = gfortran
 V_CPP = clang -E -P -x c
+V_FPP = gfortran -E -P -x c
 
 
 V_MPICC = mpicc

smeka/vendor/gnu.make

@@ -7,6 +7,7 @@ V_CC = gcc
 V_CXX = g++
 V_FC = gfortran
 V_CPP = cpp -E -P -x c
+V_FPP = gfortran -E -P -x c
 
 V_MPICC = mpicc
 V_MPICXX = mpic++

smeka/vendor/intel.make

@@ -7,6 +7,7 @@ V_CC = icc
 V_CXX = icpc
 V_FC = ifort
 V_CPP = cpp -E -P -x c
+V_FPP = ifort -E -P -xc
 
 V_MPICC = mpicc
 V_MPICXX = mpic++

smeka/vendor/pgi.make

@@ -0,0 +1,52 @@
+# This contains default compiler options
+# for the PGI vendor compiler suite.
+V_VENDOR = pgi
+
+# Compiler binaries
+V_CC = pgcc
+V_CXX = pgc++
+V_FC = pgfortran
+V_CPP = pgcc -E -P
+V_FPP = pgfortran -E -F
+
+V_MPICC = mpicc
+V_MPICXX = mpic++
+V_MPIFC = mpif90
+
+# Flag for output directory of modules
+V_FC_MODDIR = -J
+
+# Flag for PIC compilation
+V_PIC = -fPIC
+
+# default compiler flags
+V_CFLAGS =
+V_CXXFLAGS =
+V_FFLAGS =
+
+# default compiler flags for debugging
+V_FLAGS_debug = -g -Mbounds
+V_CFLAGS_debug = $(V_FLAGS_debug)
+V_CXXFLAGS_debug = $(V_FLAGS_debug)
+V_FFLAGS_debug = $(V_FLAGS_debug)
+
+# These are pgi compiler options
+V_FLAGS_weak = -O1
+V_CFLAGS_weak = $(V_FLAGS_weak)
+V_CXXFLAGS_weak = $(V_FLAGS_weak)
+V_FFLAGS_weak = $(V_FLAGS_weak)
+
+V_FLAGS_medium = -O2
+V_CFLAGS_medium = $(V_FLAGS_medium)
+V_CXXFLAGS_medium = $(V_FLAGS_medium)
+V_FFLAGS_medium = $(V_FLAGS_medium)
+
+V_FLAGS_hard = -O3
+V_CFLAGS_hard = $(V_FLAGS_hard)
+V_CXXFLAGS_hard = $(V_FLAGS_hard)
+V_FFLAGS_hard = $(V_FLAGS_hard)
+
+
+# Local Variables:
+#  mode: makefile-gmake
+# End: