From 450b73e8d901f2e660d59a89bdb96538821408ac Mon Sep 17 00:00:00 2001
From: Christos Choutouridis <hoo2@hoo2.net>
Date: Tue, 8 Dec 2020 19:02:53 +0200
Subject: [PATCH] Better support for make inside csal

---
 Makefile | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index ceaaad4..28162b9 100644
--- a/Makefile
+++ b/Makefile
@@ -236,48 +236,42 @@ v4_pthreads: $(BUILD_DIR)/$(TARGET)
 #    > make clean
 # 3) for v4 cilk for example:
 #    > make csal_v4_cilk
-# 4) run executables from `out/`
+# 4) run executables from `bin/`
 
 csal_v3: CFLAGS := $(REL_CFLAGS) -DCODE_VERSION=3
 csal_v3: TARGET := tcount_v3
 csal_v3: $(BUILD_DIR)/$(TARGET)
-	cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
 
 csal_v3_cilk: CXX    := /usr/local/OpenCilk-9.0.1-Linux/bin/clang++
 csal_v3_cilk: CFLAGS := $(REL_CFLAGS) -fcilkplus -DCODE_VERSION=3 -DCILK
 csal_v3_cilk: LDFLAGS += -fcilkplus
 csal_v3_cilk: TARGET := tcount_cilkv3
 csal_v3_cilk: $(BUILD_DIR)/$(TARGET)
-	cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
 
 csal_v3_omp: CFLAGS := $(REL_CFLAGS) -fopenmp -DCODE_VERSION=3 -DOMP
 csal_v3_omp: LDFLAGS += -fopenmp
 csal_v3_omp: TARGET := tcount_ompv3
 csal_v3_omp: $(BUILD_DIR)/$(TARGET)
-	cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
 
 csal_v4: CFLAGS := $(REL_CFLAGS) -DCODE_VERSION=4
 csal_v4: TARGET := tcount_v4
 csal_v4: $(BUILD_DIR)/$(TARGET)
-	cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
 
 csal_v4_cilk: CXX    := /usr/local/OpenCilk-9.0.1-Linux/bin/clang++
 csal_v4_cilk: CFLAGS := $(REL_CFLAGS) -fcilkplus -DCODE_VERSION=V4 -DCILK
 csal_v4_cilk: LDFLAGS += -fcilkplus
 csal_v4_cilk: TARGET := tcount_cilkv4
 csal_v4_cilk: $(BUILD_DIR)/$(TARGET)
-	cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
 
 csal_v4_omp: CFLAGS := $(REL_CFLAGS) -fopenmp -DCODE_VERSION=4 -DOMP
 csal_v4_omp: LDFLAGS += -fopenmp
 csal_v4_omp: TARGET := tcount_ompv4
 csal_v4_omp: $(BUILD_DIR)/$(TARGET)
-	cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
 
 csal_v4_pthreads: CFLAGS := $(REL_CFLAGS) -DCODE_VERSION=4 -DTHREADS
 csal_v4_pthreads: TARGET := tcount_pthv4
 csal_v4_pthreads: $(BUILD_DIR)/$(TARGET)
-	cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
+
 #
 # ================ hpc build rules =================
 #