From b77bf55ada0d97fc4f8ef8a075b6c5f9cac060e5 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Wed, 4 Jan 2023 01:12:05 +0700 Subject: [PATCH 05/10] Remove some unneeded spaces --- Makefile.tail | 28 ++++++++++++++-------------- test/Makefile | 2 +- test/dcu/Makefile | 2 +- test/x86_64/Makefile | 6 +++--- tools/Makefile | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Makefile.tail b/Makefile.tail index edddeed..f703a34 100644 --- a/Makefile.tail +++ b/Makefile.tail @@ -51,15 +51,15 @@ SPBLASOBJS = $(XSSPBLASOBJS) $(XDSPBLASOBJS) $(XCSPBLASOBJS) $(XZSPBLASOBJS) \ $(XSSPBLASOBJSCPP) $(XDSPBLASOBJSCPP) $(XCSPBLASOBJSCPP) $(XZSPBLASOBJSCPP) \ $(FSSPBLASOBJSCPP) $(FDSPBLASOBJSCPP) $(CCSPBLASOBJSCPP) $(CZSPBLASOBJSCPP) -$(XSSPBLASOBJS) $(FSSPBLASOBJS): override CFLAGS += -UDOUBLE -UCOMPLEX -$(XDSPBLASOBJS) $(FDSPBLASOBJS): override CFLAGS += -DDOUBLE -UCOMPLEX -$(XCSPBLASOBJS) $(CCSPBLASOBJS): override CFLAGS += -UDOUBLE -DCOMPLEX -$(XZSPBLASOBJS) $(CZSPBLASOBJS): override CFLAGS += -DDOUBLE -DCOMPLEX +$(XSSPBLASOBJS) $(FSSPBLASOBJS): override CFLAGS += -UDOUBLE -UCOMPLEX +$(XDSPBLASOBJS) $(FDSPBLASOBJS): override CFLAGS += -DDOUBLE -UCOMPLEX +$(XCSPBLASOBJS) $(CCSPBLASOBJS): override CFLAGS += -UDOUBLE -DCOMPLEX +$(XZSPBLASOBJS) $(CZSPBLASOBJS): override CFLAGS += -DDOUBLE -DCOMPLEX -$(XSSPBLASOBJSCPP) $(FSSPBLASOBJSCPP): override CPPFLAGS += -UDOUBLE -UCOMPLEX -$(XDSPBLASOBJSCPP) $(FDSPBLASOBJSCPP): override CPPFLAGS += -DDOUBLE -UCOMPLEX -$(XCSPBLASOBJSCPP) $(CCSPBLASOBJSCPP): override CPPFLAGS += -UDOUBLE -DCOMPLEX -$(XZSPBLASOBJSCPP) $(CZSPBLASOBJSCPP): override CPPFLAGS += -DDOUBLE -DCOMPLEX +$(XSSPBLASOBJSCPP) $(FSSPBLASOBJSCPP): override CPPFLAGS += -UDOUBLE -UCOMPLEX +$(XDSPBLASOBJSCPP) $(FDSPBLASOBJSCPP): override CPPFLAGS += -DDOUBLE -UCOMPLEX +$(XCSPBLASOBJSCPP) $(CCSPBLASOBJSCPP): override CPPFLAGS += -UDOUBLE -DCOMPLEX +$(XZSPBLASOBJSCPP) $(CZSPBLASOBJSCPP): override CPPFLAGS += -DDOUBLE -DCOMPLEX .SECONDEXPANSION: @@ -121,19 +121,19 @@ $(CZSPBLASOBJSCPP) : $(OBJ_DIR)/%.o : $$(subst _z_,_c_,%.cpp) $(HCC) -c -o $@ $^ $(CPPFLAGS) -UONAME -DONAME=$(*F) $(COMMONOBJS) : $(OBJ_DIR)/%.o : %.c - $(CC) -c -o $@ $^ $(CFLAGS) -UONAME + $(CC) -c -o $@ $^ $(CFLAGS) -UONAME -$(COMMONOBJSCPP) : $(OBJ_DIR)/%.o : %.cpp - $(HCC) -c -o $@ $^ $(CPPFLAGS) -UONAME +$(COMMONOBJSCPP) : $(OBJ_DIR)/%.o : %.cpp + $(HCC) -c -o $@ $^ $(CPPFLAGS) -UONAME $(ASMOBJS) : $(OBJ_DIR)/%.o : %.S - $(CC) -c -o $@ $^ $(CFLAGS) -UONAME + $(CC) -c -o $@ $^ $(CFLAGS) -UONAME $(OBJ) : $(OBJ_DIR)/%.o : %.c - $(CC) -c -o $@ $^ $(CFLAGS) -UONAME + $(CC) -c -o $@ $^ $(CFLAGS) -UONAME $(OBJCPP) : $(OBJ_DIR)/%.o : %.cpp - $(HCC) -c -o $@ $^ $(CPPFLAGS) -UONAME + $(HCC) -c -o $@ $^ $(CPPFLAGS) -UONAME $(BIN_DIR)/% : $(OBJ_DIR)/%.o $(LIB_DIR)/libalpha_spblas.a $(TEST_COMMON_OBJS) $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) diff --git a/test/Makefile b/test/Makefile index ea41074..4cbfb50 100644 --- a/test/Makefile +++ b/test/Makefile @@ -27,4 +27,4 @@ test : # CFLAGS += $(INC) -I$(ROOT)/test/include $(DEFINE) # CPPFLAGS += $(INC) -I$(ROOT)/test/include $(DEFINE) # $(TEST_COMMON_OBJS) : $(OBJ_DIR)/%.o : %.c -# $(CC) -c -o $@ $^ $(CFLAGS) +# $(CC) -c -o $@ $^ $(CFLAGS) diff --git a/test/dcu/Makefile b/test/dcu/Makefile index 99c7041..2d541b4 100644 --- a/test/dcu/Makefile +++ b/test/dcu/Makefile @@ -10,6 +10,6 @@ TEST_BIN = $(patsubst %.cpp, $(BIN_DIR)/%, $(notdir $(TEST_SRC)) ) CFLAGS += $(INC) $(LIB) $(DEFINE) -l:libalpha_spblas.a -lm -I$(ROOT)/test CPPFLAGS += $(INC) $(DEFINE) -I$(ROOT)/test -LDFLAGS += -l:libalpha_spblas.a -lm -lstdc++ +LDFLAGS += -l:libalpha_spblas.a -lm -lstdc++ CFLAGS += $(INC) $(DEFINE) -I$(ROOT)/test include $(ROOT)/Makefile.tail diff --git a/test/x86_64/Makefile b/test/x86_64/Makefile index f6bce0e..578f791 100644 --- a/test/x86_64/Makefile +++ b/test/x86_64/Makefile @@ -6,11 +6,11 @@ TEST_SRC = $(wildcard $(SRC_DIR)/*.c) OBJ = $(patsubst $(SRC_DIR)/%.c, $(OBJ_DIR)/%.o, $(TEST_SRC) ) TEST_BIN = $(patsubst $(SRC_DIR)/%.c, $(BIN_DIR)/%, $(TEST_SRC) ) -CFLAGS += -lmkl_cdft_core -lmkl_intel_thread -lmkl_core -lpthread -lmkl_rt -ldl +CFLAGS += -lmkl_cdft_core -lmkl_intel_thread -lmkl_core -lpthread -lmkl_rt -ldl ifeq ($(INT_64),1) -CFLAGS += -lmkl_intel_ilp64 +CFLAGS += -lmkl_intel_ilp64 else -CFLAGS += -lmkl_intel_lp64 +CFLAGS += -lmkl_intel_lp64 endif ifeq ($(OPENMP),1) CFLAGS += -liomp5 diff --git a/tools/Makefile b/tools/Makefile index 939a3b8..4bc6f26 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -8,4 +8,4 @@ TOOL_BIN = $(patsubst %.c, $(BIN_DIR)/%, $(TOOL_SRC) ) CFLAGS = -w -g -O2 -std=c11 -lm -include $(ROOT)/Makefile.tail \ No newline at end of file +include $(ROOT)/Makefile.tail -- 2.39.0