diff options
| author | Matt Turner <[email protected]> | 2013-01-21 10:27:25 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2013-04-15 12:04:25 -0700 |
| commit | d5e9426b9605264608e0b1204ebf818103f1f011 (patch) | |
| tree | 3031ccdbd85b35529129f5cef87c8779be5f8782 /src/mapi/vgapi | |
| parent | 3c690524e2ec0fdd6bef6d50897d6879fdb8b53b (diff) | |
build: Move src/mapi/mapi/* to src/mapi/
Tested-by: Emil Velikov <[email protected]>
Reviewed-and-Tested-by: Andreas Boll <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
Diffstat (limited to 'src/mapi/vgapi')
| -rw-r--r-- | src/mapi/vgapi/Makefile.am | 6 | ||||
| -rw-r--r-- | src/mapi/vgapi/SConscript | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mapi/vgapi/Makefile.am b/src/mapi/vgapi/Makefile.am index 7d7c581236e..0af7115eb70 100644 --- a/src/mapi/vgapi/Makefile.am +++ b/src/mapi/vgapi/Makefile.am @@ -40,13 +40,13 @@ VG_include_HEADERS = \ lib_LTLIBRARIES = libOpenVG.la TOP=$(top_srcdir) -include ../mapi/Makefile.sources +include ../Makefile.sources libOpenVG_la_SOURCES = $(MAPI_FILES) vgapi_tmp.h libOpenVG_la_LIBADD = $(VG_LIB_DEPS) libOpenVG_la_LDFLAGS = -version-number 1 -no-undefined -vgapi_tmp.h: $(srcdir)/vgapi.csv $(top_srcdir)/src/mapi/mapi/mapi_abi.py - $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(top_srcdir)/src/mapi/mapi/mapi_abi.py \ +vgapi_tmp.h: $(srcdir)/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 lib $< > $@ BUILT_SOURCES = vgapi_tmp.h diff --git a/src/mapi/vgapi/SConscript b/src/mapi/vgapi/SConscript index fd4467bb231..63102c107ed 100644 --- a/src/mapi/vgapi/SConscript +++ b/src/mapi/vgapi/SConscript @@ -9,7 +9,7 @@ env = env.Clone() vgapi_header, = env.CodeGenerate( target = 'vgapi_tmp.h', - script = '../mapi/mapi_abi.py', + script = '../mapi_abi.py', source = 'vgapi.csv', command = python_cmd + ' $SCRIPT --printer vgapi --mode lib $SOURCE > $TARGET' ) @@ -37,7 +37,7 @@ mapi_sources = [ vgapi_objects = [] for s in mapi_sources: - o = env.SharedObject(s[:-2], '../mapi/' + s) + o = env.SharedObject(s[:-2], '../' + s) vgapi_objects.append(o) env.Depends(vgapi_objects, vgapi_header) |