Avoid spurious GCC warnings in STATIC_ASSERT() macro.

[mesa.git] / src / mapi / mapi / sources.mak

diff --git a/src/mapi/mapi/sources.mak b/src/mapi/mapi/sources.mak
index 5f327f3df628809036f22ed563a471461348159f..56f4afd3efc3a49f69a9c70c8e7322af30f9fc26 100644 (file)
--- a/src/mapi/mapi/sources.mak
+++ b/src/mapi/mapi/sources.mak
@@ -1,19 +1,36 @@
 # src/mapi/mapi/sources.mak
 #
-# When MAPI_GLAPI_CURRENT is defined, MAPI_GLAPI_SOURCES can be built without
-# MAPI_SOURCES and it is used by glapi.
+# mapi may be used in several ways
 #
-# Otherwise, MAPI_ABI_HEADER must be defined.  It should expand to the header
-# generated by mapi_abi.py.
+#  - In default mode, mapi implements the interface defined by mapi.h.  To use
+#    this mode, compile MAPI_FILES.
+#
+#  - In util mode, mapi provides utility functions for use with glapi.  To use
+#    this mode, compile MAPI_UTIL_FILES with MAPI_MODE_UTIL defined.
+#
+#  - In glapi mode, mapi implements the interface defined by glapi.h.  To use
+#    this mode, compile MAPI_GLAPI_FILES with MAPI_MODE_GLAPI defined.
+#
+#  - In bridge mode, mapi provides entry points calling into glapi.  To use
+#    this mode, compile MAPI_BRIDGE_FILES with MAPI_MODE_BRIDGE defined.
+
+MAPI_UTIL_FILES = \
+       $(TOP)/src/mapi/mapi/u_current.c \
+       $(TOP)/src/mapi/mapi/u_execmem.c
+
+MAPI_FILES = \
+       $(TOP)/src/mapi/mapi/entry.c \
+       $(TOP)/src/mapi/mapi/mapi.c \
+       $(TOP)/src/mapi/mapi/stub.c \
+       $(TOP)/src/mapi/mapi/table.c \
+       $(MAPI_UTIL_FILES)
 
-MAPI_GLAPI_SOURCES = \
-       u_current.c \
-       u_execmem.c \
-       u_thread.c
+MAPI_GLAPI_FILES = \
+       $(TOP)/src/mapi/mapi/entry.c \
+       $(TOP)/src/mapi/mapi/mapi_glapi.c \
+       $(TOP)/src/mapi/mapi/stub.c \
+       $(TOP)/src/mapi/mapi/table.c \
+       $(MAPI_UTIL_FILES)
 
-MAPI_SOURCES = \
-       entry.c \
-       mapi.c \
-       stub.c \
-       table.c \
-       $(MAPI_GLAPI_SOURCES)
+MAPI_BRIDGE_FILES = \
+       $(TOP)/src/mapi/mapi/entry.c