fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 00:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

build/mapi: More killing of TOP in favour of top_srcdir

Browse source 
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
This commit is contained in:
Christopher James Halse Rogers 2012-07-19 12:30:11 +10:00 • committed by Matt Turner
parent 77a3efc6b9
commit 73fef0178a
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mapi/es1api/Makefile
View file

@ -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))

14
src/mapi/glapi/gen/glapi_gen.mk
View file

@ -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