From: <ic...@ke...> - 2009-11-05 15:54:44
|
Makefile.am | 4 ++-- configure.ac | 4 ++-- libdrm/intel/Makefile.am | 2 ++ libdrm/intel/libdrm_intel.pc.in | 10 ++++++++++ libdrm_intel.pc.in | 10 ---------- 5 files changed, 16 insertions(+), 14 deletions(-) New commits: commit 89cc98c0d5c1b43a883f13210c472339dde1a4cf Author: Julien Cristau <jcr...@de...> Date: Sat Oct 31 02:25:44 2009 +0100 Only install libdrm_intel.pc if we build libdrm_intel diff --git a/Makefile.am b/Makefile.am index e105edd..5b1ae60 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,6 +25,6 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = libdrm shared-core tests pkgconfigdir = @pkgconfigdir@ -pkgconfig_DATA = libdrm.pc libdrm_intel.pc +pkgconfig_DATA = libdrm.pc -EXTRA_DIST = libdrm.pc.in libdrm_intel.pc.in +EXTRA_DIST = libdrm.pc.in diff --git a/configure.ac b/configure.ac index 7efc4d4..410a359 100644 --- a/configure.ac +++ b/configure.ac @@ -194,6 +194,7 @@ AC_OUTPUT([ Makefile libdrm/Makefile libdrm/intel/Makefile + libdrm/intel/libdrm_intel.pc libdrm/radeon/Makefile libdrm/radeon/libdrm_radeon.pc libdrm/nouveau/Makefile @@ -202,5 +203,4 @@ AC_OUTPUT([ tests/Makefile tests/modeprint/Makefile tests/modetest/Makefile - libdrm.pc - libdrm_intel.pc]) + libdrm.pc]) diff --git a/libdrm/intel/Makefile.am b/libdrm/intel/Makefile.am index 28f8952..0faa10d 100644 --- a/libdrm/intel/Makefile.am +++ b/libdrm/intel/Makefile.am @@ -46,3 +46,5 @@ libdrm_intel_la_SOURCES = \ libdrm_intelincludedir = ${includedir} libdrm_intelinclude_HEADERS = intel_bufmgr.h + +pkgconfig_DATA = libdrm_intel.pc diff --git a/libdrm/intel/libdrm_intel.pc.in b/libdrm/intel/libdrm_intel.pc.in new file mode 100644 index 0000000..ea71cc3 --- /dev/null +++ b/libdrm/intel/libdrm_intel.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libdrm +Description: Userspace interface to kernel DRM services +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -ldrm -ldrm_intel +Cflags: -I${includedir} -I${includedir}/drm diff --git a/libdrm_intel.pc.in b/libdrm_intel.pc.in deleted file mode 100644 index ea71cc3..0000000 --- a/libdrm_intel.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libdrm -Description: Userspace interface to kernel DRM services -Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -ldrm -ldrm_intel -Cflags: -I${includedir} -I${includedir}/drm |