Browse Source

doc: pkg-config packages are now suffixed with 1.0. Add footnote about the no-suffix packages

Nathalie Furmento 13 years ago
parent
commit
cc9feef30d

+ 6 - 6
doc/chapters/basic-examples.texi

@@ -32,8 +32,8 @@ options must be given to the compiler and to the linker:
 
 @cartouche
 @example
-CFLAGS          +=      $$(pkg-config --cflags libstarpu)
-LDFLAGS         +=      $$(pkg-config --libs libstarpu)
+CFLAGS          +=      $$(pkg-config --cflags libstarpu1.0)
+LDFLAGS         +=      $$(pkg-config --libs libstarpu1.0)
 @end example
 @end cartouche
 
@@ -218,7 +218,7 @@ disabled thanks to @code{starpu_data_set_default_sequential_consistency_flag} or
 
 @smallexample
 % make hello_world
-cc $(pkg-config --cflags libstarpu)  $(pkg-config --libs libstarpu) hello_world.c -o hello_world
+cc $(pkg-config --cflags libstarpu1.0)  $(pkg-config --libs libstarpu1.0) hello_world.c -o hello_world
 % ./hello_world
 Hello world (params = @{1, 2.000000@} )
 Callback function (arg 42)
@@ -345,7 +345,7 @@ constant factor from this pointer.
 
 @smallexample
 % make vector_scal
-cc $(pkg-config --cflags libstarpu)  $(pkg-config --libs libstarpu)  vector_scal.c   -o vector_scal
+cc $(pkg-config --cflags libstarpu1.0)  $(pkg-config --libs libstarpu1.0)  vector_scal.c   -o vector_scal
 % ./vector_scal
 0.000000 3.000000 6.000000 9.000000 12.000000
 @end smallexample
@@ -595,8 +595,8 @@ be compiled at run-time when calling the function
 
 @cartouche
 @smallexample
-CFLAGS  += $(shell pkg-config --cflags libstarpu)
-LDFLAGS += $(shell pkg-config --libs libstarpu)
+CFLAGS  += $(shell pkg-config --cflags libstarpu1.0)
+LDFLAGS += $(shell pkg-config --libs libstarpu1.0)
 CC       = gcc
 
 vector_scal: vector_scal.o vector_scal_cpu.o vector_scal_cuda.o vector_scal_opencl.o

+ 2 - 2
doc/chapters/fft-support.texi

@@ -48,8 +48,8 @@ The flags required to compile or link against the FFT library are accessible
 with the following commands:
 
 @example
-% pkg-config --cflags libstarpufft  # options for the compiler
-% pkg-config --libs libstarpufft    # options for the linker
+% pkg-config --cflags libstarpufft1.0  # options for the compiler
+% pkg-config --libs libstarpufft1.0    # options for the linker
 @end example
 
 Also pass the @code{--static} option if the application is to be linked statically.

+ 2 - 2
doc/chapters/mpi-support.texi

@@ -35,8 +35,8 @@ The flags required to compile or link against the MPI layer are then
 accessible with the following commands:
 
 @example
-% pkg-config --cflags libstarpumpi  # options for the compiler
-% pkg-config --libs libstarpumpi    # options for the linker
+% pkg-config --cflags libstarpumpi1.0  # options for the compiler
+% pkg-config --libs libstarpumpi1.0    # options for the linker
 @end example
 
 Also pass the @code{--static} option if the application is to be linked statically.

+ 7 - 3
doc/chapters/using.texi

@@ -33,11 +33,15 @@ The flags required to compile or link against StarPU are then
 accessible with the following commands:
 
 @example
-% pkg-config --cflags libstarpu  # options for the compiler
-% pkg-config --libs libstarpu    # options for the linker
+% pkg-config --cflags libstarpu1.0  # options for the compiler
+% pkg-config --libs libstarpu1.0    # options for the linker
 @end example
 
-Also pass the @code{--static} option if the application is to be linked statically.
+Also pass the @code{--static} option if the application is to be
+linked statically@footnote{It is still possible to use the API
+provided in the version 0.9 of StarPU by calling @code{pkg-config}
+with the @code{libstarpu} package. Similar packages are provided for
+@code{libstarpumpi} and @code{libstarpufft}.}.
 
 @node Running a basic StarPU application
 @section Running a basic StarPU application

+ 5 - 5
doc/tutorial/Makefile

@@ -1,7 +1,7 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
 # Copyright (C) 2009-2011  Université de Bordeaux 1
-# Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
+# Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
 #
 # Redistribution  and  use  in  source and binary forms, with or without
 # modification,  are  permitted  provided  that the following conditions
@@ -28,12 +28,12 @@
 # OF  THIS  SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-CFLAGS          +=      $$(pkg-config --cflags libstarpu)
-LDFLAGS         +=      $$(pkg-config --libs libstarpu)
+CFLAGS          +=      $$(pkg-config --cflags libstarpu1.0)
+LDFLAGS         +=      $$(pkg-config --libs libstarpu1.0)
 
-HAS_CUDA	=	$(shell pkg-config --libs libstarpu|grep -i cuda)
+HAS_CUDA	=	$(shell pkg-config --libs libstarpu1.0 |grep -i cuda)
 NVCC		?=	nvcc
-HAS_OPENCL	=	$(shell pkg-config --libs libstarpu|grep -i opencl)
+HAS_OPENCL	=	$(shell pkg-config --libs libstarpu1.0 |grep -i opencl)
 
 %.o: %.cu
 	nvcc $(CFLAGS) $< -c