diff --git a/Makefile b/Makefile index 3a3b631..91c8eae 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ cpu: $(TARGET)CPU gpu: $(TARGET)GPU $(TARGET)CPU: $(CPU_OBJ) - $(CC) $(CFLAGS) $^ -o $@ $(INC) $(LIB) $(LDFLAGS) + $(CC) $(CFLAGS) $^ -o $@ $(INC) $(LIB) $(LD) $(CPU_BUILD_DIR)/%.o $(CPU_BUILD_DIR)/%.cu.o: $(SRC_DIR)/%.cpp | $(CPU_BUILD_DIR) $(CC) $(CFLAGS) -c -o $@ $< $(INC) diff --git a/Makefile.template b/Makefile.template index 48f72f8..e64d346 100644 --- a/Makefile.template +++ b/Makefile.template @@ -63,7 +63,7 @@ cpu: $(TARGET)CPU gpu: $(TARGET)GPU $(TARGET)CPU: $(CPU_OBJ) - $(CC) $(CFLAGS) $^ -o $@ $(INC) $(LIB) $(LDFLAGS) + $(CC) $(CFLAGS) $^ -o $@ $(INC) $(LIB) $(LD) $(CPU_BUILD_DIR)/%.o $(CPU_BUILD_DIR)/%.cu.o: $(SRC_DIR)/%.cpp | $(CPU_BUILD_DIR) $(CC) $(CFLAGS) -c -o $@ $< $(INC) diff --git a/samples/1_CoreKernel/Makefile b/samples/1_CoreKernel/Makefile index 6f7f454..6725ac7 100644 --- a/samples/1_CoreKernel/Makefile +++ b/samples/1_CoreKernel/Makefile @@ -63,7 +63,7 @@ cpu: $(TARGET)CPU gpu: $(TARGET)GPU $(TARGET)CPU: $(CPU_OBJ) - $(CC) $(CFLAGS) $^ -o $@ $(INC) $(LIB) $(LDFLAGS) + $(CC) $(CFLAGS) $^ -o $@ $(INC) $(LIB) $(LD) $(CPU_BUILD_DIR)/%.o $(CPU_BUILD_DIR)/%.cu.o: $(SRC_DIR)/%.cpp | $(CPU_BUILD_DIR) $(CC) $(CFLAGS) -c -o $@ $< $(INC) diff --git a/samples/2_CoreClass/Makefile b/samples/2_CoreClass/Makefile index 431fb52..b4cea59 100644 --- a/samples/2_CoreClass/Makefile +++ b/samples/2_CoreClass/Makefile @@ -63,7 +63,7 @@ cpu: $(TARGET)CPU gpu: $(TARGET)GPU $(TARGET)CPU: $(CPU_OBJ) - $(CC) $(CFLAGS) $^ -o $@ $(INC) $(LIB) $(LDFLAGS) + $(CC) $(CFLAGS) $^ -o $@ $(INC) $(LIB) $(LD) $(CPU_BUILD_DIR)/%.o $(CPU_BUILD_DIR)/%.cu.o: $(SRC_DIR)/%.cpp | $(CPU_BUILD_DIR) $(CC) $(CFLAGS) -c -o $@ $< $(INC) diff --git a/samples/3_ArrayKernel/Makefile b/samples/3_ArrayKernel/Makefile index 8ae9bcf..32b8583 100644 --- a/samples/3_ArrayKernel/Makefile +++ b/samples/3_ArrayKernel/Makefile @@ -63,7 +63,7 @@ cpu: $(TARGET)CPU gpu: $(TARGET)GPU $(TARGET)CPU: $(CPU_OBJ) - $(CC) $(CFLAGS) $^ -o $@ $(INC) $(LIB) $(LDFLAGS) + $(CC) $(CFLAGS) $^ -o $@ $(INC) $(LIB) $(LD) $(CPU_BUILD_DIR)/%.o $(CPU_BUILD_DIR)/%.cu.o: $(SRC_DIR)/%.cpp | $(CPU_BUILD_DIR) $(CC) $(CFLAGS) -c -o $@ $< $(INC) diff --git a/samples/4_ArrayFunctions/Makefile b/samples/4_ArrayFunctions/Makefile index 3ac8ce3..cf48f56 100644 --- a/samples/4_ArrayFunctions/Makefile +++ b/samples/4_ArrayFunctions/Makefile @@ -63,7 +63,7 @@ cpu: $(TARGET)CPU gpu: $(TARGET)GPU $(TARGET)CPU: $(CPU_OBJ) - $(CC) $(CFLAGS) $^ -o $@ $(INC) $(LIB) $(LDFLAGS) + $(CC) $(CFLAGS) $^ -o $@ $(INC) $(LIB) $(LD) $(CPU_BUILD_DIR)/%.o $(CPU_BUILD_DIR)/%.cu.o: $(SRC_DIR)/%.cpp | $(CPU_BUILD_DIR) $(CC) $(CFLAGS) -c -o $@ $< $(INC) diff --git a/samples/5_SimpleGraph/Makefile b/samples/5_SimpleGraph/Makefile index 528c55b..74d9d7f 100644 --- a/samples/5_SimpleGraph/Makefile +++ b/samples/5_SimpleGraph/Makefile @@ -63,7 +63,7 @@ cpu: $(TARGET)CPU gpu: $(TARGET)GPU $(TARGET)CPU: $(CPU_OBJ) - $(CC) $(CFLAGS) $^ -o $@ $(INC) $(LIB) $(LDFLAGS) + $(CC) $(CFLAGS) $^ -o $@ $(INC) $(LIB) $(LD) $(CPU_BUILD_DIR)/%.o $(CPU_BUILD_DIR)/%.cu.o: $(SRC_DIR)/%.cpp | $(CPU_BUILD_DIR) $(CC) $(CFLAGS) -c -o $@ $< $(INC)