diff --git a/Makefile b/Makefile index a4e369c..3c5654f 100644 --- a/Makefile +++ b/Makefile @@ -16,22 +16,17 @@ include $(MAKE_DIR)/include_LIKWID.mk ifneq ($(strip $(ISA)),NONE) include $(MAKE_DIR)/include_ISA.mk endif -include $(MAKE_DIR)/include_GROMACS.mk INCLUDES += -I./$(SRC_DIR) -I./$(COMMON_DIR) VPATH = $(SRC_DIR) $(COMMON_DIR) $(CUDA_DIR) ASM = $(patsubst $(SRC_DIR)/%.c, $(BUILD_DIR)/%.s,$(wildcard $(SRC_DIR)/*.c)) -OVERWRITE:= $(patsubst $(ASM_DIR)/%-new.s, $(BUILD_DIR)/%.o,$(wildcard $(ASM_DIR)/*-new.s)) -OBJ = $(filter-out $(BUILD_DIR)/main% $(OVERWRITE),$(patsubst $(SRC_DIR)/%.c, $(BUILD_DIR)/%.o,$(wildcard $(SRC_DIR)/*.c))) -OBJ += $(patsubst $(ASM_DIR)/%.s, $(BUILD_DIR)/%.o,$(wildcard $(ASM_DIR)/*.s)) +OBJ = $(filter-out $(BUILD_DIR)/main%, $(patsubst $(SRC_DIR)/%.c, $(BUILD_DIR)/%.o,$(wildcard $(SRC_DIR)/*.c))) OBJ += $(patsubst $(COMMON_DIR)/%.c, $(BUILD_DIR)/%.o,$(wildcard $(COMMON_DIR)/*.c)) ifeq ($(strip $(TAG)),NVCC) OBJ += $(patsubst $(CUDA_DIR)/%.cu, $(BUILD_DIR)/%-cuda.o,$(wildcard $(CUDA_DIR)/*.cu)) endif CPPFLAGS := $(CPPFLAGS) $(DEFINES) $(OPTIONS) $(INCLUDES) -# $(warning $(OBJ)) - ifneq ($(VARIANT),) .DEFAULT_GOAL := ${TARGET}-$(VARIANT) DEFINES += -DVARIANT=$(VARIANT) diff --git a/make/include_GROMACS.mk b/make/include_GROMACS.mk deleted file mode 100644 index d91198d..0000000 --- a/make/include_GROMACS.mk +++ /dev/null @@ -1,11 +0,0 @@ -GROMACS_PATH=/apps/Gromacs/2018.1-mkl -GROMACS_INC ?= -I${GROMACS_PATH}/include -GROMACS_DEFINES ?= -GROMACS_LIB ?= -L${GROMACS_PATH}/lib64 - -ifeq ($(strip $(XTC_OUTPUT)),true) -INCLUDES += ${GROMACS_INC} -DEFINES += ${GROMACS_DEFINES} -LIBS += -lgromacs -LFLAGS += ${GROMACS_LIB} -endif