summaryrefslogtreecommitdiff
path: root/src/gallium/state_trackers/vega
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2013-01-21 10:27:25 -0800
committerMatt Turner <mattst88@gmail.com>2013-04-15 12:04:25 -0700
commitd5e9426b9605264608e0b1204ebf818103f1f011 (patch)
tree3031ccdbd85b35529129f5cef87c8779be5f8782 /src/gallium/state_trackers/vega
parent3c690524e2ec0fdd6bef6d50897d6879fdb8b53b (diff)
build: Move src/mapi/mapi/* to src/mapi/
Tested-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-and-Tested-by: Andreas Boll <andreas.boll.dev@gmail.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Diffstat (limited to 'src/gallium/state_trackers/vega')
-rw-r--r--src/gallium/state_trackers/vega/Makefile.am4
-rw-r--r--src/gallium/state_trackers/vega/SConscript2
-rw-r--r--src/gallium/state_trackers/vega/api.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/state_trackers/vega/Makefile.am b/src/gallium/state_trackers/vega/Makefile.am
index 3ae096c85f3..5c5d071d105 100644
--- a/src/gallium/state_trackers/vega/Makefile.am
+++ b/src/gallium/state_trackers/vega/Makefile.am
@@ -63,6 +63,6 @@ libvega_la_SOURCES = \
BUILT_SOURCES = api_tmp.h
CLEANFILES = api_tmp.h
-api_tmp.h: $(top_srcdir)/src/mapi/vgapi/vgapi.csv $(top_srcdir)/src/mapi/mapi/mapi_abi.py
- $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(top_srcdir)/src/mapi/mapi/mapi_abi.py \
+api_tmp.h: $(top_srcdir)/src/mapi/vgapi/vgapi.csv $(top_srcdir)/src/mapi/mapi_abi.py
+ $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(top_srcdir)/src/mapi/mapi_abi.py \
--printer vgapi --mode app $< > $@
diff --git a/src/gallium/state_trackers/vega/SConscript b/src/gallium/state_trackers/vega/SConscript
index 394eaffe7bd..f8d75040255 100644
--- a/src/gallium/state_trackers/vega/SConscript
+++ b/src/gallium/state_trackers/vega/SConscript
@@ -49,7 +49,7 @@ vega_sources = [
api_tmp, = env.CodeGenerate(
target = 'api_tmp.h',
- script = '#src/mapi/mapi/mapi_abi.py',
+ script = '#src/mapi/mapi_abi.py',
source = '#src/mapi/vgapi/vgapi.csv',
command = python_cmd + ' $SCRIPT --printer vgapi --mode app $SOURCE > $TARGET'
)
diff --git a/src/gallium/state_trackers/vega/api.c b/src/gallium/state_trackers/vega/api.c
index 4bf7c71d453..8fb0c418b19 100644
--- a/src/gallium/state_trackers/vega/api.c
+++ b/src/gallium/state_trackers/vega/api.c
@@ -26,7 +26,7 @@
* Chia-I Wu <olv@lunarg.com>
*/
-#include "mapi/mapi.h"
+#include "mapi.h"
/* define vega_spec and vega_procs for use with mapi */
#define API_TMP_DEFINE_SPEC