From a37ae2ab922a0a7fceb9dba85dba11c26f4cf736 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 17 Dec 2014 18:50:25 -0800 Subject: mapi: Build with subdir-objects. --- src/mapi/Makefile.am | 38 +++++++++++++++++++++--------- src/mapi/Makefile.sources | 52 ++++++++++++++++++++--------------------- src/mapi/glapi/Makefile.sources | 22 ----------------- src/mapi/glapi/gen/glapi_gen.mk | 40 ------------------------------- 4 files changed, 53 insertions(+), 99 deletions(-) delete mode 100644 src/mapi/glapi/Makefile.sources delete mode 100644 src/mapi/glapi/gen/glapi_gen.mk diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am index f6fc477a2b7..67946829198 100644 --- a/src/mapi/Makefile.am +++ b/src/mapi/Makefile.am @@ -19,11 +19,11 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. +AUTOMAKE_OPTIONS = subdir-objects + SUBDIRS = TESTS = -TOP = $(top_srcdir) - BUILT_SOURCES = CLEANFILES = $(BUILT_SOURCES) @@ -47,10 +47,20 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/mapi \ -I$(top_builddir)/src/mapi -GLAPI = $(top_srcdir)/src/mapi/glapi include Makefile.sources -include glapi/Makefile.sources -include glapi/gen/glapi_gen.mk + +glapi_gen_mapi_deps := \ + mapi_abi.py \ + $(wildcard glapi/gen/*.xml) \ + $(wildcard glapi/gen/*.py) + +# $(1): path to an XML file +# $(2): name of the printer +define glapi_gen_mapi +@$(MKDIR_P) $(dir $@) +$(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/mapi_abi.py \ + --mode lib --printer $(2) $(1) > $@ +endef if HAVE_SHARED_GLAPI BUILT_SOURCES += shared-glapi/glapi_mapi_tmp.h @@ -81,7 +91,7 @@ shared_glapi_test_LDADD = \ $(top_builddir)/src/gtest/libgtest.la endif -shared-glapi/glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) +shared-glapi/glapi_mapi_tmp.h : glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) $(call glapi_gen_mapi,$<,shared-glapi) if HAVE_OPENGL @@ -89,16 +99,16 @@ noinst_LTLIBRARIES = glapi/libglapi.la if HAVE_X86_ASM if HAVE_X86_64_ASM -GLAPI_ASM_SOURCES = $(X86_64_API) +GLAPI_ASM_SOURCES = glapi/glapi_x86-64.S else -GLAPI_ASM_SOURCES = $(X86_API) +GLAPI_ASM_SOURCES = glapi/glapi_x86.S endif endif if HAVE_SPARC_ASM -GLAPI_ASM_SOURCES = $(SPARC_API) +GLAPI_ASM_SOURCES = glapi/glapi_sparc.S endif -glapi_libglapi_la_SOURCES = $(GLAPI_UTIL_SOURCES) +glapi_libglapi_la_SOURCES = glapi/glapi_gentable.c glapi_libglapi_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir)/src/mapi/glapi \ @@ -113,7 +123,13 @@ else glapi_libglapi_la_CPPFLAGS += \ -DMAPI_MODE_UTIL glapi_libglapi_la_SOURCES += \ - $(GLAPI_SOURCES) \ + glapi/glapi_dispatch.c \ + glapi/glapi_entrypoint.c \ + glapi/glapi_getproc.c \ + glapi/glapi_nop.c \ + glapi/glapi.c \ + glapi/glapi.h \ + glapi/glapi_priv.h \ $(GLAPI_ASM_SOURCES) \ $(MAPI_UTIL_FILES) diff --git a/src/mapi/Makefile.sources b/src/mapi/Makefile.sources index 4ce1afb23de..41dbb24c839 100644 --- a/src/mapi/Makefile.sources +++ b/src/mapi/Makefile.sources @@ -15,38 +15,38 @@ # this mode, compile MAPI_BRIDGE_FILES with MAPI_MODE_BRIDGE defined. MAPI_UTIL_FILES = \ - $(TOP)/src/mapi/u_compiler.h \ - $(TOP)/src/mapi/u_current.c \ - $(TOP)/src/mapi/u_current.h \ - $(TOP)/src/mapi/u_execmem.c \ - $(TOP)/src/mapi/u_execmem.h \ - $(TOP)/src/mapi/u_macros.h \ - $(TOP)/src/mapi/u_thread.h + u_compiler.h \ + u_current.c \ + u_current.h \ + u_execmem.c \ + u_execmem.h \ + u_macros.h \ + u_thread.h MAPI_BRIDGE_FILES = \ - $(TOP)/src/mapi/entry.c \ - $(TOP)/src/mapi/entry.h \ - $(TOP)/src/mapi/entry_x86-64_tls.h \ - $(TOP)/src/mapi/entry_x86_tls.h \ - $(TOP)/src/mapi/entry_x86_tsd.h \ - $(TOP)/src/mapi/mapi_tmp.h + entry.c \ + entry.h \ + entry_x86-64_tls.h \ + entry_x86_tls.h \ + entry_x86_tsd.h \ + mapi_tmp.h MAPI_FILES = \ - $(TOP)/src/mapi/entry.c \ - $(TOP)/src/mapi/mapi.c \ - $(TOP)/src/mapi/mapi.h \ - $(TOP)/src/mapi/stub.c \ - $(TOP)/src/mapi/stub.h \ - $(TOP)/src/mapi/table.c \ - $(TOP)/src/mapi/table.h \ + entry.c \ + mapi.c \ + mapi.h \ + stub.c \ + stub.h \ + table.c \ + table.h \ $(MAPI_UTIL_FILES) MAPI_GLAPI_FILES = \ - $(TOP)/src/mapi/entry.c \ - $(TOP)/src/mapi/mapi_glapi.c \ - $(TOP)/src/mapi/stub.c \ - $(TOP)/src/mapi/stub.h \ - $(TOP)/src/mapi/table.c \ - $(TOP)/src/mapi/table.h \ + entry.c \ + mapi_glapi.c \ + stub.c \ + stub.h \ + table.c \ + table.h \ $(MAPI_UTIL_FILES) diff --git a/src/mapi/glapi/Makefile.sources b/src/mapi/glapi/Makefile.sources deleted file mode 100644 index df149a7d82b..00000000000 --- a/src/mapi/glapi/Makefile.sources +++ /dev/null @@ -1,22 +0,0 @@ -# src/mapi/glapi/Makefile.sources - -GLAPI_UTIL_SOURCES = \ - $(top_builddir)/src/mapi/glapi/glapi_gentable.c - -GLAPI_SOURCES = \ - $(top_srcdir)/src/mapi/glapi/glapi_dispatch.c \ - $(top_srcdir)/src/mapi/glapi/glapi_entrypoint.c \ - $(top_srcdir)/src/mapi/glapi/glapi_getproc.c \ - $(top_srcdir)/src/mapi/glapi/glapi_nop.c \ - $(top_srcdir)/src/mapi/glapi/glapi.c \ - $(top_srcdir)/src/mapi/glapi/glapi.h \ - $(top_srcdir)/src/mapi/glapi/glapi_priv.h - -X86_API = \ - $(top_builddir)/src/mapi/glapi/glapi_x86.S - -X86_64_API = \ - $(top_builddir)/src/mapi/glapi/glapi_x86-64.S - -SPARC_API = \ - $(top_builddir)/src/mapi/glapi/glapi_sparc.S diff --git a/src/mapi/glapi/gen/glapi_gen.mk b/src/mapi/glapi/gen/glapi_gen.mk deleted file mode 100644 index b8bb2f465e4..00000000000 --- a/src/mapi/glapi/gen/glapi_gen.mk +++ /dev/null @@ -1,40 +0,0 @@ -# Helpers for glapi header generation - -glapi_gen_common_deps := \ - $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.xml) \ - $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.py) - -glapi_gen_mapi_script := $(top_srcdir)/src/mapi/mapi_abi.py -glapi_gen_mapi_deps := \ - $(glapi_gen_mapi_script) \ - $(glapi_gen_common_deps) - -# $(1): path to an XML file -# $(2): name of the printer -define glapi_gen_mapi -@$(MKDIR_P) $(dir $@) -$(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_mapi_script) \ - --mode lib --printer $(2) $(1) > $@ -endef - -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 -# $(2): empty, es1, or es2 for entry point filtering -define glapi_gen_dispatch -@$(MKDIR_P) $(dir $@) -$(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_srcdir)/src/mapi/glapi/gen/remap_helper.py -glapi_gen_remap_deps := $(glapi_gen_common_deps) - -# $(1): path to an XML file -# $(2): empty, es1, or es2 for entry point filtering -define glapi_gen_remap -@$(MKDIR_P) $(dir $@) -$(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_remap_script) \ - -f $(1) $(if $(2),-c $(2),) > $@ -endef -- cgit v1.2.3