From: <an...@ke...> - 2010-03-17 19:52:13
|
include/drm/Makefile.am | 2 +- intel/Makefile.am | 2 +- intel/libdrm_intel.pc.in | 2 +- libdrm.pc.in | 2 +- nouveau/Makefile.am | 2 +- nouveau/libdrm_nouveau.pc.in | 3 ++- radeon/Makefile.am | 2 +- radeon/libdrm_radeon.pc.in | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) New commits: commit ef36c9a3b2828f5a11feda9e4d2708bf3a4a7a52 Author: Eric Anholt <er...@an...> Date: Wed Mar 17 12:46:21 2010 -0700 intel: Install the header file in the libdrm/ directory. Suggested-by: Rémi Cardona <re...@ge...> Signed-off-by: Eric Anholt <er...@an...> diff --git a/intel/Makefile.am b/intel/Makefile.am index 9add505..1ae92f8 100644 --- a/intel/Makefile.am +++ b/intel/Makefile.am @@ -43,7 +43,7 @@ libdrm_intel_la_SOURCES = \ mm.c \ mm.h -libdrm_intelincludedir = ${includedir} +libdrm_intelincludedir = ${includedir}/libdrm libdrm_intelinclude_HEADERS = intel_bufmgr.h pkgconfig_DATA = libdrm_intel.pc diff --git a/intel/libdrm_intel.pc.in b/intel/libdrm_intel.pc.in index e8080d9..3ba6793 100644 --- a/intel/libdrm_intel.pc.in +++ b/intel/libdrm_intel.pc.in @@ -8,4 +8,4 @@ Description: Userspace interface to kernel DRM services Version: @PACKAGE_VERSION@ Requires: libdrm Libs: -L${libdir} -ldrm_intel -Cflags: -I${includedir} +Cflags: -I${includedir} -I${includedir}/libdrm commit 976e779f9cd0571dd2c218580485b39d37bd18a0 Author: Julien Cristau <jcr...@de...> Date: Fri Feb 26 19:07:24 2010 +0100 Install headers to $(includedir)/libdrm Avoids conflicts with kernel headers. Signed-off-by: Julien Cristau <jcr...@de...> Reviewed-by: Rémi Cardona <re...@ge...> Signed-off-by: Eric Anholt <er...@an...> diff --git a/include/drm/Makefile.am b/include/drm/Makefile.am index 9046955..43695bd 100644 --- a/include/drm/Makefile.am +++ b/include/drm/Makefile.am @@ -22,7 +22,7 @@ # however, r300 and via need their reg headers installed in order to build. # better solutions are welcome. -klibdrmincludedir = ${includedir}/drm +klibdrmincludedir = ${includedir}/libdrm klibdrminclude_HEADERS = \ drm.h \ drm_mode.h \ diff --git a/libdrm.pc.in b/libdrm.pc.in index 6e00597..b46e2a6 100644 --- a/libdrm.pc.in +++ b/libdrm.pc.in @@ -7,4 +7,4 @@ Name: libdrm Description: Userspace interface to kernel DRM services Version: @PACKAGE_VERSION@ Libs: -L${libdir} -ldrm -Cflags: -I${includedir} -I${includedir}/drm +Cflags: -I${includedir} -I${includedir}/libdrm diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am index 5d759c5..b6d214a 100644 --- a/nouveau/Makefile.am +++ b/nouveau/Makefile.am @@ -34,7 +34,7 @@ libdrm_nouveaucommoninclude_HEADERS = \ nouveau_reloc.h -libdrm_nouveauincludedir = ${includedir}/drm +libdrm_nouveauincludedir = ${includedir}/libdrm libdrm_nouveauinclude_HEADERS = \ nouveau_drmif.h diff --git a/nouveau/libdrm_nouveau.pc.in b/nouveau/libdrm_nouveau.pc.in index 6ae6287..c78a28a 100644 --- a/nouveau/libdrm_nouveau.pc.in +++ b/nouveau/libdrm_nouveau.pc.in @@ -7,5 +7,5 @@ Name: libdrm_nouveau Description: Userspace interface to nouveau kernel DRM services Version: 0.6 Libs: -L${libdir} -ldrm_nouveau -Cflags: -I${includedir} -I${includedir}/drm -I${includedir}/nouveau +Cflags: -I${includedir} -I${includedir}/libdrm -I${includedir}/nouveau Requires.private: libdrm diff --git a/radeon/Makefile.am b/radeon/Makefile.am index 29af1df..de78232 100644 --- a/radeon/Makefile.am +++ b/radeon/Makefile.am @@ -41,7 +41,7 @@ libdrm_radeon_la_SOURCES = \ radeon_bo.c \ radeon_cs.c -libdrm_radeonincludedir = ${includedir}/drm +libdrm_radeonincludedir = ${includedir}/libdrm libdrm_radeoninclude_HEADERS = \ radeon_bo.h \ radeon_cs.h \ diff --git a/radeon/libdrm_radeon.pc.in b/radeon/libdrm_radeon.pc.in index ab703e1..68ef0ab 100644 --- a/radeon/libdrm_radeon.pc.in +++ b/radeon/libdrm_radeon.pc.in @@ -7,4 +7,4 @@ Name: libdrm_radeon Description: Userspace interface to kernel DRM services for radeon Version: @PACKAGE_VERSION@ Libs: -L${libdir} -ldrm_radeon -Cflags: -I${includedir} -I${includedir}/drm +Cflags: -I${includedir} -I${includedir}/libdrm commit e73af7f560c95ba9c665bead7fc8eb1471db9975 Author: Julien Cristau <jcr...@de...> Date: Fri Feb 26 19:07:23 2010 +0100 libdrm_nouveau requires libdrm nouveau_drmif.h includes xf86drm.h. Signed-off-by: Julien Cristau <jcr...@de...> Signed-off-by: Eric Anholt <er...@an...> diff --git a/nouveau/libdrm_nouveau.pc.in b/nouveau/libdrm_nouveau.pc.in index 7ef49e5..6ae6287 100644 --- a/nouveau/libdrm_nouveau.pc.in +++ b/nouveau/libdrm_nouveau.pc.in @@ -8,3 +8,4 @@ Description: Userspace interface to nouveau kernel DRM services Version: 0.6 Libs: -L${libdir} -ldrm_nouveau Cflags: -I${includedir} -I${includedir}/drm -I${includedir}/nouveau +Requires.private: libdrm commit d271336925eee55057b6665e193b578da534a903 Author: Julien Cristau <jcr...@de...> Date: Fri Feb 26 19:07:22 2010 +0100 libdrm_intel.pc: don't include ${includedir}/drm intel_bufmgr.h is installed in ${includedir} directly, and the other headers are taken care of by libdrm.pc's Cflags. Signed-off-by: Julien Cristau <jcr...@de...> Signed-off-by: Eric Anholt <er...@an...> diff --git a/intel/libdrm_intel.pc.in b/intel/libdrm_intel.pc.in index b93f1c6..e8080d9 100644 --- a/intel/libdrm_intel.pc.in +++ b/intel/libdrm_intel.pc.in @@ -8,4 +8,4 @@ Description: Userspace interface to kernel DRM services Version: @PACKAGE_VERSION@ Requires: libdrm Libs: -L${libdir} -ldrm_intel -Cflags: -I${includedir} -I${includedir}/drm +Cflags: -I${includedir} |