[PATCH] drm: allow build outide of source

Peter Clifton pcjc2 at cam.ac.uk
Sun Aug 10 09:13:35 PDT 2008


On Sun, 2008-08-10 at 17:18 +0200, Matthieu Herrb wrote:
> Hi
> 
> The simple attached patch is needed after the latest merges in drm.
> 
> plain text document attachment (libdrm.diff)
> diff --git a/libdrm/intel/Makefile.am b/libdrm/intel/Makefile.am
> index 111204b..31a8512 100644
> --- a/libdrm/intel/Makefile.am
> +++ b/libdrm/intel/Makefile.am
> @@ -24,6 +24,7 @@
>  
>  AM_CFLAGS = \
>  	$(WARN_CFLAGS) \
> +	-I$(top_srcdir)/libdrm \
>  	-I$(top_srcdir)/shared-core
>  
>  noinst_LTLIBRARIES = libdrm_intel.la

Hijacking here, for the Intel driver:

diff --git a/src/Makefile.am b/src/Makefile.am
index dd92c8d..3e08135 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,7 @@ SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 tfp410 $(REGDUMPER)
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 
 AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
-       @PCIACCESS_CFLAGS@ -I../uxa \
+       @PCIACCESS_CFLAGS@ -I$(top_srcdir)/uxa \
        @XMODES_CFLAGS@ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA -DI830_USE_UXA
 
 intel_drv_la_LTLIBRARIES = intel_drv.la


-- 
Peter Clifton

Electrical Engineering Division,
Engineering Department,
University of Cambridge,
9, JJ Thomson Avenue,
Cambridge
CB3 0FA

Tel: +44 (0)7729 980173 - (No signal in the lab!)




More information about the xorg mailing list