diff options
| author | Christopher James Halse Rogers <[email protected]> | 2012-07-19 12:30:06 +1000 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-08-13 12:24:04 -0700 |
| commit | b2ecaab7ad671f97840867c26869e0accf25592c (patch) | |
| tree | b1cf9836bc455fc751650c86a6221e1e7e0f5307 /src/mesa/libdricore | |
| parent | 4e087de51ad0e7ba4a7199d3664e1d096f8dc510 (diff) | |
build: fix location of generated files in src/mesa (v4)
Also fix include paths for the generated headers.
v2: Switch to using self-explanatory BUILDDIR/SRCDIR defined from
top_builddir/top_srcdir rather than the ambiguous TOP.
v3: Add both top_builddir and top_srcdir to include flags for mesa asm.
These rely on both in-tree and build-time-generated includes.
v4: Rebased on top of 948c8f502a.
Reviewed-by: Eric Anholt <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Signed-off-by: Christopher James Halse Rogers <[email protected]>
Signed-off-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa/libdricore')
| -rw-r--r-- | src/mesa/libdricore/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am index 0b18fc0ce0a..367d8c038ea 100644 --- a/src/mesa/libdricore/Makefile.am +++ b/src/mesa/libdricore/Makefile.am @@ -20,9 +20,9 @@ # IN THE SOFTWARE. TOP=$(top_srcdir) -SRCDIR = $(srcdir)/../ +SRCDIR=$(top_srcdir)/src/mesa/ +BUILDDIR=$(top_builddir)/src/mesa/ include ../sources.mak -GLSL_SRCDIR = $(srcdir)/../../glsl include ../../glsl/Makefile.sources noinst_PROGRAMS = |