diff options
author | Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | 2012-07-19 12:30:06 +1000 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2012-08-13 12:24:04 -0700 |
commit | b2ecaab7ad671f97840867c26869e0accf25592c (patch) | |
tree | b1cf9836bc455fc751650c86a6221e1e7e0f5307 /src/glx | |
parent | 4e087de51ad0e7ba4a7199d3664e1d096f8dc510 (diff) | |
download | external_mesa3d-b2ecaab7ad671f97840867c26869e0accf25592c.zip external_mesa3d-b2ecaab7ad671f97840867c26869e0accf25592c.tar.gz external_mesa3d-b2ecaab7ad671f97840867c26869e0accf25592c.tar.bz2 |
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 <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/glx')
-rw-r--r-- | src/glx/apple/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/glx/apple/Makefile b/src/glx/apple/Makefile index 35edb09..ef12eb0 100644 --- a/src/glx/apple/Makefile +++ b/src/glx/apple/Makefile @@ -1,4 +1,8 @@ TOP = ../../.. +top_builddir = $(TOP) +# This can be a filthy lie. But it doesn't currently build out-of-tree +# anyway, so it's no worse than what we've got now. +top_srcdir = $(TOP) include $(TOP)/configs/current |