diff options
| author | Matt Turner <mattst88@gmail.com> | 2013-01-21 10:27:25 -0800 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2013-04-15 12:04:25 -0700 |
| commit | d5e9426b9605264608e0b1204ebf818103f1f011 (patch) | |
| tree | 3031ccdbd85b35529129f5cef87c8779be5f8782 /src/mapi/shared-glapi | |
| parent | 3c690524e2ec0fdd6bef6d50897d6879fdb8b53b (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/mapi/shared-glapi')
| -rw-r--r-- | src/mapi/shared-glapi/Makefile.am | 2 | ||||
| -rw-r--r-- | src/mapi/shared-glapi/SConscript | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mapi/shared-glapi/Makefile.am b/src/mapi/shared-glapi/Makefile.am index 2cc5c590548..2021a7330f1 100644 --- a/src/mapi/shared-glapi/Makefile.am +++ b/src/mapi/shared-glapi/Makefile.am @@ -2,7 +2,7 @@ TOP = $(top_srcdir) GLAPI = $(top_srcdir)/src/mapi/glapi -include $(top_srcdir)/src/mapi/mapi/Makefile.sources +include $(top_srcdir)/src/mapi/Makefile.sources lib_LTLIBRARIES = libglapi.la libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) diff --git a/src/mapi/shared-glapi/SConscript b/src/mapi/shared-glapi/SConscript index 0097c1c79ec..07b3eff118d 100644 --- a/src/mapi/shared-glapi/SConscript +++ b/src/mapi/shared-glapi/SConscript @@ -28,7 +28,7 @@ def mapi_objects(env, printer, mode): # generate ABI header header = env.CodeGenerate( target = header_name, - script = '../mapi/mapi_abi.py', + script = '../mapi_abi.py', source = '../glapi/gen/gl_and_es_API.xml', command = python_cmd + ' $SCRIPT ' + \ '--printer %s --mode lib $SOURCE > $TARGET' % (printer), @@ -59,7 +59,7 @@ def mapi_objects(env, printer, mode): for s in mapi_sources[mode]: o = env.SharedObject( target = '%s-%s' % (printer, s[:-2]), - source = '../mapi/' + s, + source = '../' + s, CPPPATH = cpppath, CPPDEFINES = cppdefines, ) |