summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2009-10-31 02:25:44 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2009-11-05 15:49:09 +0000
commit89cc98c0d5c1b43a883f13210c472339dde1a4cf (patch)
tree4be35556215ab87281811a339e63fde889c8c4c3
parentb7ed162d2912d53d03d94f9ceaebf7d96d570c04 (diff)
Only install libdrm_intel.pc if we build libdrm_intel
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac4
-rw-r--r--libdrm/intel/Makefile.am2
-rw-r--r--libdrm/intel/libdrm_intel.pc.in (renamed from libdrm_intel.pc.in)0
4 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index e105eddb..5b1ae60a 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 7efc4d4e..410a359c 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 28f8952b..0faa10dc 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.pc.in b/libdrm/intel/libdrm_intel.pc.in
index ea71cc3e..ea71cc3e 100644
--- a/libdrm_intel.pc.in
+++ b/libdrm/intel/libdrm_intel.pc.in