diff options
| author | Christopher James Halse Rogers <[email protected]> | 2012-07-19 12:30:11 +1000 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-08-13 12:24:47 -0700 |
| commit | 73fef0178ad9fb0fc47679fcc485144b4ef08fb6 (patch) | |
| tree | b9130717fa996d0a8e497d17d428f30f18aab2ef | |
| parent | 77a3efc6b907943903190b385fdf107c4acfcdca (diff) | |
build/mapi: More killing of TOP in favour of top_srcdir
Reviewed-by: Eric Anholt <[email protected]>
Signed-off-by: Christopher James Halse Rogers <[email protected]>
| -rw-r--r-- | src/mapi/es1api/Makefile | 4 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/glapi_gen.mk | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/mapi/es1api/Makefile b/src/mapi/es1api/Makefile index a9c91231954..6f4c35af4ed 100644 --- a/src/mapi/es1api/Makefile +++ b/src/mapi/es1api/Makefile @@ -40,6 +40,10 @@ esapi_CPPFLAGS := \ -I$(TOP)/src/mapi \ -DMAPI_ABI_HEADER=\"$(ESAPI)/glapi_mapi_tmp.h\" + +# This is a lie when doing out-of-tree builds, but it's no worse than the +# current situation, and can be dropped should this get automakified +top_srcdir = $(TOP) include $(MAPI)/sources.mak esapi_SOURCES := $(MAPI_BRIDGE_FILES) esapi_OBJECTS := $(notdir $(MAPI_BRIDGE_FILES:.c=.o)) diff --git a/src/mapi/glapi/gen/glapi_gen.mk b/src/mapi/glapi/gen/glapi_gen.mk index 1b05a405b93..eab8eb40cf7 100644 --- a/src/mapi/glapi/gen/glapi_gen.mk +++ b/src/mapi/glapi/gen/glapi_gen.mk @@ -1,14 +1,14 @@ # Helpers for glapi header generation -ifndef TOP -$(error TOP must be defined.) +ifndef top_srcdir +$(error top_srcdir must be defined.) endif glapi_gen_common_deps := \ - $(wildcard $(TOP)/src/mapi/glapi/gen/*.xml) \ - $(wildcard $(TOP)/src/mapi/glapi/gen/*.py) + $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.xml) \ + $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.py) -glapi_gen_mapi_script := $(TOP)/src/mapi/mapi/mapi_abi.py +glapi_gen_mapi_script := $(top_srcdir)/src/mapi/mapi/mapi_abi.py glapi_gen_mapi_deps := \ $(glapi_gen_mapi_script) \ $(glapi_gen_common_deps) @@ -21,7 +21,7 @@ $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_mapi_script) \ --mode lib --printer $(2) $(1) > $@ endef -glapi_gen_dispatch_script := $(TOP)/src/mapi/glapi/gen/gl_table.py +glapi_gen_dispatch_script := $(top_srcdir)/src/mapi/glapi/gen/gl_table.py glapi_gen_dispatch_deps := $(glapi_gen_common_deps) # $(1): path to an XML file @@ -32,7 +32,7 @@ $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_dispatch_script) \ -f $(1) -m remap_table $(if $(2),-c $(2),) > $@ endef -glapi_gen_remap_script := $(TOP)/src/mapi/glapi/gen/remap_helper.py +glapi_gen_remap_script := $(top_srcdir)/src/mapi/glapi/gen/remap_helper.py glapi_gen_remap_deps := $(glapi_gen_common_deps) # $(1): path to an XML file |