From 254d954c85e2eb3d0f79e18a9abaf5fc4182af74 Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Fri, 14 Oct 2011 17:31:24 +0200 Subject: [PATCH] pkgconfig: move files to a specific directory. --- Makefile.am | 19 +---------- configure.ac | 11 ++++--- pkgconfig/Makefile.am | 47 ++++++++++++++++++++++++++++ libva-egl.pc.in => pkgconfig/libva-egl.pc.in | 0 libva-glx.pc.in => pkgconfig/libva-glx.pc.in | 0 libva-tpi.pc.in => pkgconfig/libva-tpi.pc.in | 0 libva-x11.pc.in => pkgconfig/libva-x11.pc.in | 0 libva.pc.in => pkgconfig/libva.pc.in | 0 8 files changed, 54 insertions(+), 23 deletions(-) create mode 100644 pkgconfig/Makefile.am rename libva-egl.pc.in => pkgconfig/libva-egl.pc.in (100%) rename libva-glx.pc.in => pkgconfig/libva-glx.pc.in (100%) rename libva-tpi.pc.in => pkgconfig/libva-tpi.pc.in (100%) rename libva-x11.pc.in => pkgconfig/libva-x11.pc.in (100%) rename libva.pc.in => pkgconfig/libva.pc.in (100%) diff --git a/Makefile.am b/Makefile.am index f0223e0..97cc0eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,24 +22,7 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = va test +SUBDIRS = va pkgconfig test if BUILD_DUMMY_DRIVER SUBDIRS += dummy_drv_video endif - -pcfiles = libva.pc libva-tpi.pc -pcfiles += libva-x11.pc -if USE_GLX -pcfiles += libva-glx.pc -endif - -if USE_EGL -pcfiles += libva-egl.pc -endif - -pkgconfigdir = @pkgconfigdir@ -pkgconfig_DATA = $(pcfiles) - -EXTRA_DIST = libva.pc.in libva-tpi.pc.in libva-x11.pc.in libva-glx.pc.in libva-egl.pc.in - -CLEANFILES = $(pcfiles) diff --git a/configure.ac b/configure.ac index 07843f0..e618337 100644 --- a/configure.ac +++ b/configure.ac @@ -162,11 +162,12 @@ AC_OUTPUT([ test/putsurface/Makefile test/encode/Makefile test/vainfo/Makefile - libva.pc - libva-x11.pc - libva-glx.pc - libva-egl.pc - libva-tpi.pc + pkgconfig/libva-egl.pc + pkgconfig/libva-glx.pc + pkgconfig/libva-tpi.pc + pkgconfig/libva-x11.pc + pkgconfig/libva.pc + pkgconfig/Makefile ]) # Print a small summary diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am new file mode 100644 index 0000000..f595413 --- /dev/null +++ b/pkgconfig/Makefile.am @@ -0,0 +1,47 @@ +# Copyright (c) 2007 Intel Corporation. All Rights Reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sub license, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice (including the +# next paragraph) shall be included in all copies or substantial portions +# of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. +# IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR +# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +pcfiles = libva.pc +pcfiles += libva-tpi.pc +pcfiles += libva-x11.pc +if USE_GLX +pcfiles += libva-glx.pc +endif +if USE_EGL +pcfiles += libva-egl.pc +endif + +all_pcfiles_in = libva.pc.in +all_pcfiles_in += libva-tpi.pc.in +all_pcfiles_in += libva-x11.pc.in +all_pcfiles_in += libva-glx.pc.in +all_pcfiles_in += libva-egl.pc.in + +pkgconfigdir = @pkgconfigdir@ +pkgconfig_DATA = $(pcfiles) + +EXTRA_DIST = $(all_pcfiles_in) + +DISTCLEANFILES = $(pcfiles) + +# Extra clean files so that maintainer-clean removes *everything* +MAINTAINERCLEANFILES = Makefile.in diff --git a/libva-egl.pc.in b/pkgconfig/libva-egl.pc.in similarity index 100% rename from libva-egl.pc.in rename to pkgconfig/libva-egl.pc.in diff --git a/libva-glx.pc.in b/pkgconfig/libva-glx.pc.in similarity index 100% rename from libva-glx.pc.in rename to pkgconfig/libva-glx.pc.in diff --git a/libva-tpi.pc.in b/pkgconfig/libva-tpi.pc.in similarity index 100% rename from libva-tpi.pc.in rename to pkgconfig/libva-tpi.pc.in diff --git a/libva-x11.pc.in b/pkgconfig/libva-x11.pc.in similarity index 100% rename from libva-x11.pc.in rename to pkgconfig/libva-x11.pc.in diff --git a/libva.pc.in b/pkgconfig/libva.pc.in similarity index 100% rename from libva.pc.in rename to pkgconfig/libva.pc.in -- 2.7.4