Browse Source

rename pkg-config package names from libXXX1.0.pc to libXXX-1.0.pc

Nathalie Furmento 13 years ago
parent
commit
68927a851a

+ 2 - 2
Makefile.am

@@ -43,9 +43,9 @@ SUBDIRS += starpufft
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libstarpu.pc libstarpu1.0.pc
+pkgconfig_DATA = libstarpu.pc libstarpu-1.0.pc
 if USE_MPI
-pkgconfig_DATA += libstarpumpi.pc libstarpumpi1.0.pc
+pkgconfig_DATA += libstarpumpi.pc libstarpumpi-1.0.pc
 endif
 
 versincludedir = $(includedir)/starpu/$(STARPU_EFFECTIVE_VERSION)

+ 3 - 3
configure.ac

@@ -1472,12 +1472,12 @@ AC_OUTPUT([
 	socl/src/Makefile
 	socl/examples/Makefile
 	libstarpu.pc
-	libstarpu1.0.pc
+	libstarpu-1.0.pc
 	libstarpumpi.pc
-	libstarpumpi1.0.pc
+	libstarpumpi-1.0.pc
 	starpufft/Makefile
 	starpufft/libstarpufft.pc
-	starpufft/libstarpufft1.0.pc
+	starpufft/libstarpufft-1.0.pc
 	examples/Makefile
         examples/opt/Makefile
 	examples/stencil/Makefile

+ 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 libstarpu1.0)
-LDFLAGS         +=      $$(pkg-config --libs libstarpu1.0)
+CFLAGS          +=      $$(pkg-config --cflags libstarpu-1.0)
+LDFLAGS         +=      $$(pkg-config --libs libstarpu-1.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 libstarpu1.0)  $(pkg-config --libs libstarpu1.0) hello_world.c -o hello_world
+cc $(pkg-config --cflags libstarpu-1.0)  $(pkg-config --libs libstarpu-1.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 libstarpu1.0)  $(pkg-config --libs libstarpu1.0)  vector_scal.c   -o vector_scal
+cc $(pkg-config --cflags libstarpu-1.0)  $(pkg-config --libs libstarpu-1.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 libstarpu1.0)
-LDFLAGS += $(shell pkg-config --libs libstarpu1.0)
+CFLAGS  += $(shell pkg-config --cflags libstarpu-1.0)
+LDFLAGS += $(shell pkg-config --libs libstarpu-1.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 libstarpufft1.0  # options for the compiler
-% pkg-config --libs libstarpufft1.0    # options for the linker
+% pkg-config --cflags libstarpufft-1.0  # options for the compiler
+% pkg-config --libs libstarpufft-1.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 libstarpumpi1.0  # options for the compiler
-% pkg-config --libs libstarpumpi1.0    # options for the linker
+% pkg-config --cflags libstarpumpi-1.0  # options for the compiler
+% pkg-config --libs libstarpumpi-1.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/using.texi

@@ -33,8 +33,8 @@ The flags required to compile or link against StarPU are then
 accessible with the following commands:
 
 @example
-% pkg-config --cflags libstarpu1.0  # options for the compiler
-% pkg-config --libs libstarpu1.0    # options for the linker
+% pkg-config --cflags libstarpu-1.0  # options for the compiler
+% pkg-config --libs libstarpu-1.0    # options for the linker
 @end example
 
 Also pass the @code{--static} option if the application is to be

+ 4 - 4
doc/tutorial/Makefile

@@ -28,12 +28,12 @@
 # OF  THIS  SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-CFLAGS          +=      $$(pkg-config --cflags libstarpu1.0)
-LDFLAGS         +=      $$(pkg-config --libs libstarpu1.0)
+CFLAGS          +=      $$(pkg-config --cflags libstarpu-1.0)
+LDFLAGS         +=      $$(pkg-config --libs libstarpu-1.0)
 
-HAS_CUDA	=	$(shell pkg-config --libs libstarpu1.0 |grep -i cuda)
+HAS_CUDA	=	$(shell pkg-config --libs libstarpu-1.0 |grep -i cuda)
 NVCC		?=	nvcc
-HAS_OPENCL	=	$(shell pkg-config --libs libstarpu1.0 |grep -i opencl)
+HAS_OPENCL	=	$(shell pkg-config --libs libstarpu-1.0 |grep -i opencl)
 
 %.o: %.cu
 	nvcc $(CFLAGS) $< -c

libstarpu1.0.pc.in → libstarpu-1.0.pc.in


libstarpumpi1.0.pc.in → libstarpumpi-1.0.pc.in


+ 1 - 1
starpufft/Makefile.am

@@ -39,7 +39,7 @@ versinclude_HEADERS = 				\
 	starpufft.h
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libstarpufft.pc libstarpufft1.0.pc
+pkgconfig_DATA = libstarpufft.pc libstarpufft-1.0.pc
 
 libstarpufft_@STARPU_EFFECTIVE_VERSION@_la_SOURCES = starpufft.c starpufftf.c starpufft_common.c
 libstarpufft_@STARPU_EFFECTIVE_VERSION@_la_LIBADD = $(top_builddir)/src/libstarpu-@STARPU_EFFECTIVE_VERSION@.la $(FFTW_LIBS) $(FFTWF_LIBS)

starpufft/libstarpufft1.0.pc.in → starpufft/libstarpufft-1.0.pc.in