瀏覽代碼

Use LDLIBS instead of LDFLAGS

otherwise -l flags are misplaced with default Makefile rules
Samuel Thibault 6 年之前
父節點
當前提交
b0b6c69f72
共有 3 個文件被更改,包括 8 次插入8 次删除
  1. 2 2
      doc/doxygen/chapters/101_building.doxy
  2. 2 2
      doc/doxygen/chapters/110_basic_examples.doxy
  3. 4 4
      doc/tutorial/Makefile

+ 2 - 2
doc/doxygen/chapters/101_building.doxy

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2010-2019                                CNRS
  * Copyright (C) 2011,2012,2018                           Inria
- * Copyright (C) 2009-2011,2013-2016                      Université de Bordeaux
+ * Copyright (C) 2009-2011,2013-2016,2019                 Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -211,7 +211,7 @@ options for the compiler and the linker:
 
 \verbatim
 CFLAGS          +=      $$(pkg-config --cflags starpu-1.3)
-LDFLAGS         +=      $$(pkg-config --libs starpu-1.3)
+LDLIBS          +=      $$(pkg-config --libs starpu-1.3)
 \endverbatim
 
 \subsection IntegratingStarPUInABuildSystem Integrating StarPU in a Build System

+ 2 - 2
doc/doxygen/chapters/110_basic_examples.doxy

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2010-2013,2015-2019                      CNRS
  * Copyright (C) 2011-2013                                Inria
- * Copyright (C) 2009-2011,2014,2015                      Université de Bordeaux
+ * Copyright (C) 2009-2011,2014,2015,2019                 Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -459,7 +459,7 @@ starpu_opencl_load_opencl_from_file().
 
 \verbatim
 CFLAGS  += $(shell pkg-config --cflags starpu-1.3)
-LDFLAGS += $(shell pkg-config --libs starpu-1.3)
+LDLIBS  += $(shell pkg-config --libs starpu-1.3)
 CC       = gcc
 
 vector_scal: vector_scal.o vector_scal_cpu.o vector_scal_cuda.o vector_scal_opencl.o

+ 4 - 4
doc/tutorial/Makefile

@@ -1,6 +1,6 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2009-2011                                 Université de Bordeaux
+# Copyright (C) 2009-2011, 2019                                 Université de Bordeaux
 # Copyright (C) 2010-2014, 2019                           CNRS
 #
 # StarPU is free software; you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 
 CFLAGS          +=      $$(pkg-config --cflags starpu-1.1)
-LDFLAGS         +=      $$(pkg-config --libs starpu-1.1)
+LDLIBS          +=      $$(pkg-config --libs starpu-1.1)
 
 HAS_CUDA	=	$(shell pkg-config --libs starpu-1.1 |grep -i cuda)
 NVCC		?=	nvcc
@@ -40,7 +40,7 @@ VECTOR_SCAL_PREREQUISITES += vector_scal_opencl.o
 endif
 
 vector_scal: $(VECTOR_SCAL_PREREQUISITES)
-	$(VECTOR_SCAL_COMPILER) $(LDFLAGS) $^ -o $@
+	$(VECTOR_SCAL_COMPILER) $^ $(LDLIBS) -o $@
 
 VECTOR_SCAL_TASK_INSERT_PREREQUISITES		=	vector_scal_task_insert.o vector_scal_cpu.o
 ifneq ($(strip $(HAS_CUDA)),)
@@ -54,7 +54,7 @@ VECTOR_SCAL_TASK_INSERT_PREREQUISITES += vector_scal_opencl.o
 endif
 
 vector_scal_task_insert: $(VECTOR_SCAL_TASK_INSERT_PREREQUISITES)
-	$(VECTOR_SCAL_TASK_INSERT_COMPILER) $(LDFLAGS) $^ -o $@
+	$(VECTOR_SCAL_TASK_INSERT_COMPILER) $^ $(LDLIBS) -o $@
 
 clean:
 	rm -f $(TARGETS) *.o