From d5e9426b9605264608e0b1204ebf818103f1f011 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 21 Jan 2013 10:27:25 -0800 Subject: build: Move src/mapi/mapi/* to src/mapi/ Tested-by: Emil Velikov Reviewed-and-Tested-by: Andreas Boll Reviewed-by: Jordan Justen --- src/gallium/state_trackers/vega/Makefile.am | 4 ++-- src/gallium/state_trackers/vega/SConscript | 2 +- src/gallium/state_trackers/vega/api.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gallium/state_trackers/vega') 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 */ -#include "mapi/mapi.h" +#include "mapi.h" /* define vega_spec and vega_procs for use with mapi */ #define API_TMP_DEFINE_SPEC -- cgit v1.2.3