diff options
author | Julien Cristau | 2009-10-30 20:25:44 -0500 |
---|---|---|
committer | Chris Wilson | 2009-11-05 09:49:09 -0600 |
commit | 89cc98c0d5c1b43a883f13210c472339dde1a4cf (patch) | |
tree | 4be35556215ab87281811a339e63fde889c8c4c3 | |
parent | b7ed162d2912d53d03d94f9ceaebf7d96d570c04 (diff) | |
download | external-libdrm-89cc98c0d5c1b43a883f13210c472339dde1a4cf.tar.gz external-libdrm-89cc98c0d5c1b43a883f13210c472339dde1a4cf.tar.xz external-libdrm-89cc98c0d5c1b43a883f13210c472339dde1a4cf.zip |
Only install libdrm_intel.pc if we build libdrm_intel
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | libdrm/intel/Makefile.am | 2 | ||||
-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 | |||
25 | SUBDIRS = libdrm shared-core tests | 25 | SUBDIRS = libdrm shared-core tests |
26 | 26 | ||
27 | pkgconfigdir = @pkgconfigdir@ | 27 | pkgconfigdir = @pkgconfigdir@ |
28 | pkgconfig_DATA = libdrm.pc libdrm_intel.pc | 28 | pkgconfig_DATA = libdrm.pc |
29 | 29 | ||
30 | EXTRA_DIST = libdrm.pc.in libdrm_intel.pc.in | 30 | 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([ | |||
194 | Makefile | 194 | Makefile |
195 | libdrm/Makefile | 195 | libdrm/Makefile |
196 | libdrm/intel/Makefile | 196 | libdrm/intel/Makefile |
197 | libdrm/intel/libdrm_intel.pc | ||
197 | libdrm/radeon/Makefile | 198 | libdrm/radeon/Makefile |
198 | libdrm/radeon/libdrm_radeon.pc | 199 | libdrm/radeon/libdrm_radeon.pc |
199 | libdrm/nouveau/Makefile | 200 | libdrm/nouveau/Makefile |
@@ -202,5 +203,4 @@ AC_OUTPUT([ | |||
202 | tests/Makefile | 203 | tests/Makefile |
203 | tests/modeprint/Makefile | 204 | tests/modeprint/Makefile |
204 | tests/modetest/Makefile | 205 | tests/modetest/Makefile |
205 | libdrm.pc | 206 | libdrm.pc]) |
206 | libdrm_intel.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 = \ | |||
46 | 46 | ||
47 | libdrm_intelincludedir = ${includedir} | 47 | libdrm_intelincludedir = ${includedir} |
48 | libdrm_intelinclude_HEADERS = intel_bufmgr.h | 48 | libdrm_intelinclude_HEADERS = intel_bufmgr.h |
49 | |||
50 | 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 | |||