build: Rename sources.mak -> Makefile.sources

For the sake of consistency.

Tested-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-and-Tested-by: Andreas Boll <andreas.boll.dev@gmail.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/src/glx/apple/Makefile b/src/glx/apple/Makefile
index f6faa1ef71cda5cf0d15bfccc8325236bfffb9d4..7dab068b25251e54c4525d903fe54abe0bf7e163 100644 (file)
--- a/src/glx/apple/Makefile
+++ b/src/glx/apple/Makefile
@@ -58,7 +58,7 @@ SOURCES = \
        ../xfont.c \
        ../applegl_glx.c
 
-include $(TOP)/src/mesa/sources.mak
+include $(TOP)/src/mesa/Makefile.sources
 
 # override GLAPI_LIB
 GLAPI_LIB = $(TOP)/src/mapi/glapi/libglapi.a

diff --git a/src/mapi/glapi/Makefile.am b/src/mapi/glapi/Makefile.am
index bdb527d5c5c6c1637815a7adb31a65aeda290859..cf2602aed0a043767dfbf2737d9737e863cd9b6f 100644 (file)
--- a/src/mapi/glapi/Makefile.am
+++ b/src/mapi/glapi/Makefile.am
@@ -20,8 +20,8 @@
 # IN THE SOFTWARE.
 
 TOP = $(top_srcdir)
-include sources.mak
-include ../mapi/sources.mak
+include Makefile.sources
+include ../mapi/Makefile.sources
 
 AM_CPPFLAGS = \
         $(DEFINES) \

diff --git a/src/mapi/glapi/Makefile.sources b/src/mapi/glapi/Makefile.sources
new file mode 100644 (file)
index 0000000..58d28c5
--- /dev/null
+++ b/src/mapi/glapi/Makefile.sources
@@ -0,0 +1,19 @@
+# src/mapi/glapi/Makefile.sources
+
+GLAPI_SOURCES = \
+       glapi_dispatch.c \
+       glapi_entrypoint.c \
+       glapi_gentable.c \
+       glapi_getproc.c \
+       glapi_nop.c \
+       glthread.c \
+       glapi.c
+
+X86_API =                      \
+       glapi_x86.S
+
+X86_64_API =                   \
+       glapi_x86-64.S
+
+SPARC_API =                    \
+       glapi_sparc.S

diff --git a/src/mapi/glapi/sources.mak b/src/mapi/glapi/sources.mak
deleted file mode 100644 (file)
index aa8a4d4..0000000
--- a/src/mapi/glapi/sources.mak
+++ /dev/null
@@ -1,19 +0,0 @@
-# src/mapi/glapi/sources.mak
-
-GLAPI_SOURCES = \
-       glapi_dispatch.c \
-       glapi_entrypoint.c \
-       glapi_gentable.c \
-       glapi_getproc.c \
-       glapi_nop.c \
-       glthread.c \
-       glapi.c
-
-X86_API =                      \
-       glapi_x86.S
-
-X86_64_API =                   \
-       glapi_x86-64.S
-
-SPARC_API =                    \
-       glapi_sparc.S

diff --git a/src/mapi/mapi/Makefile.sources b/src/mapi/mapi/Makefile.sources
new file mode 100644 (file)
index 0000000..a2f6c71
--- /dev/null
+++ b/src/mapi/mapi/Makefile.sources
@@ -0,0 +1,36 @@
+# src/mapi/mapi/Makefile.sources
+#
+# mapi may be used in several ways
+#
+#  - 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_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_BRIDGE_FILES = \
+       $(TOP)/src/mapi/mapi/entry.c

diff --git a/src/mapi/mapi/sources.mak b/src/mapi/mapi/sources.mak
deleted file mode 100644 (file)
index 56f4afd..0000000
--- a/src/mapi/mapi/sources.mak
+++ /dev/null
@@ -1,36 +0,0 @@
-# src/mapi/mapi/sources.mak
-#
-# mapi may be used in several ways
-#
-#  - 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_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_BRIDGE_FILES = \
-       $(TOP)/src/mapi/mapi/entry.c

diff --git a/src/mapi/shared-glapi/Makefile.am b/src/mapi/shared-glapi/Makefile.am
index d215c43ad95d8829afaf1c41201d99033ab62b26..2cc5c590548808172acce9c2b1c123201ea6a283 100644 (file)
--- a/src/mapi/shared-glapi/Makefile.am
+++ b/src/mapi/shared-glapi/Makefile.am
@@ -2,7 +2,7 @@
 
 TOP = $(top_srcdir)
 GLAPI = $(top_srcdir)/src/mapi/glapi
-include $(top_srcdir)/src/mapi/mapi/sources.mak
+include $(top_srcdir)/src/mapi/mapi/Makefile.sources
 
 lib_LTLIBRARIES = libglapi.la
 libglapi_la_SOURCES = $(MAPI_GLAPI_FILES)

diff --git a/src/mapi/vgapi/Makefile.am b/src/mapi/vgapi/Makefile.am
index b7abf92a1cc4bd84024571c28b7a5711efc0b918..7d7c581236ebcfebab268cb895f0fcb17aa38199 100644 (file)
--- a/src/mapi/vgapi/Makefile.am
+++ b/src/mapi/vgapi/Makefile.am
@@ -40,7 +40,7 @@ VG_include_HEADERS = \
 lib_LTLIBRARIES = libOpenVG.la
 
 TOP=$(top_srcdir)
-include ../mapi/sources.mak
+include ../mapi/Makefile.sources
 libOpenVG_la_SOURCES = $(MAPI_FILES) vgapi_tmp.h
 libOpenVG_la_LIBADD = $(VG_LIB_DEPS)
 libOpenVG_la_LDFLAGS = -version-number 1 -no-undefined

diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk
index 093d7a18940bb59008a48a03a1343431471324d4..00c06943c0ba2b73a9f8922a9bc2ed9e3fdcd9f3 100644 (file)
--- a/src/mesa/Android.libmesa_dricore.mk
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -31,7 +31,7 @@ LOCAL_PATH := $(call my-dir)
 # Import the following variables:
 #     MESA_FILES
 #     X86_FILES
-include $(LOCAL_PATH)/sources.mak
+include $(LOCAL_PATH)/Makefile.sources
 
 include $(CLEAR_VARS)
 

diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk
index 79914caf17e395a903d50b2756f52fa3823bdadd..e7203c41dfea29a98db3680702cd23d8e8b2c0c4 100644 (file)
--- a/src/mesa/Android.libmesa_st_mesa.mk
+++ b/src/mesa/Android.libmesa_st_mesa.mk
@@ -31,7 +31,7 @@ LOCAL_PATH := $(call my-dir)
 # Import variables:
 #      MESA_GALLIUM_FILES.
 #      X86_FILES
-include $(LOCAL_PATH)/sources.mak
+include $(LOCAL_PATH)/Makefile.sources
 
 include $(CLEAR_VARS)
 

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index c341c48e79984e9740e4bf4c0eb46b27228bb7d1..14685e769313ce3d75eb4706f01085542047992c 100644 (file)
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -81,7 +81,7 @@ endif
 
 SRCDIR = $(top_srcdir)/src/mesa/
 BUILDDIR = $(top_builddir)/src/mesa/
-include sources.mak
+include Makefile.sources
 
 AM_CPPFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS)
 AM_CFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CFLAGS)

diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources
new file mode 100644 (file)
index 0000000..a5c1f5d
--- /dev/null
+++ b/src/mesa/Makefile.sources
@@ -0,0 +1,350 @@
+### Lists of source files, included by Makefiles
+
+# This file is among different build systems. SRCDIR must be defined with
+# a trailing slash because the Android build system leaves it undefined.
+
+# this is part of MAIN_FILES
+MAIN_ES_FILES = \
+       $(SRCDIR)main/es1_conversion.c
+
+MAIN_FILES = \
+       $(SRCDIR)main/api_arrayelt.c \
+       $(BUILDDIR)main/api_exec.c \
+       $(SRCDIR)main/api_loopback.c \
+       $(SRCDIR)main/api_validate.c \
+       $(SRCDIR)main/accum.c \
+       $(SRCDIR)main/arbprogram.c \
+       $(SRCDIR)main/atifragshader.c \
+       $(SRCDIR)main/attrib.c \
+       $(SRCDIR)main/arrayobj.c \
+       $(SRCDIR)main/blend.c \
+       $(SRCDIR)main/bufferobj.c \
+       $(SRCDIR)main/buffers.c \
+       $(SRCDIR)main/clear.c \
+       $(SRCDIR)main/clip.c \
+       $(SRCDIR)main/colortab.c \
+       $(SRCDIR)main/condrender.c \
+       $(SRCDIR)main/context.c \
+       $(SRCDIR)main/convolve.c \
+       $(SRCDIR)main/cpuinfo.c \
+       $(SRCDIR)main/debug.c \
+       $(SRCDIR)main/depth.c \
+       $(SRCDIR)main/dlist.c \
+       $(SRCDIR)main/drawpix.c \
+       $(SRCDIR)main/drawtex.c \
+       $(SRCDIR)main/enable.c \
+       $(SRCDIR)main/errors.c \
+       $(SRCDIR)main/eval.c \
+       $(SRCDIR)main/execmem.c \
+       $(SRCDIR)main/extensions.c \
+       $(SRCDIR)main/fbobject.c \
+       $(SRCDIR)main/feedback.c \
+       $(SRCDIR)main/ffvertex_prog.c \
+       $(SRCDIR)main/ff_fragment_shader.cpp \
+       $(SRCDIR)main/fog.c \
+       $(SRCDIR)main/formatquery.c \
+       $(SRCDIR)main/formats.c \
+       $(SRCDIR)main/format_pack.c \
+       $(SRCDIR)main/format_unpack.c \
+       $(SRCDIR)main/framebuffer.c \
+       $(SRCDIR)main/get.c \
+       $(SRCDIR)main/getstring.c \
+       $(SRCDIR)main/glformats.c \
+       $(SRCDIR)main/hash.c \
+       $(SRCDIR)main/hash_table.c \
+       $(SRCDIR)main/hint.c \
+       $(SRCDIR)main/histogram.c \
+       $(SRCDIR)main/image.c \
+       $(SRCDIR)main/imports.c \
+       $(SRCDIR)main/light.c \
+       $(SRCDIR)main/lines.c \
+       $(SRCDIR)main/matrix.c \
+       $(SRCDIR)main/mipmap.c \
+       $(SRCDIR)main/mm.c \
+       $(SRCDIR)main/multisample.c \
+       $(SRCDIR)main/pack.c \
+       $(SRCDIR)main/pbo.c \
+       $(SRCDIR)main/pixel.c \
+       $(SRCDIR)main/pixelstore.c \
+       $(SRCDIR)main/pixeltransfer.c \
+       $(SRCDIR)main/points.c \
+       $(SRCDIR)main/polygon.c \
+       $(SRCDIR)main/queryobj.c \
+       $(SRCDIR)main/querymatrix.c \
+       $(SRCDIR)main/rastpos.c \
+       $(SRCDIR)main/readpix.c \
+       $(SRCDIR)main/remap.c \
+       $(SRCDIR)main/renderbuffer.c \
+       $(SRCDIR)main/samplerobj.c \
+       $(SRCDIR)main/scissor.c \
+       $(SRCDIR)main/set.c \
+       $(SRCDIR)main/shaderapi.c \
+       $(SRCDIR)main/shaderobj.c \
+       $(SRCDIR)main/shader_query.cpp \
+       $(SRCDIR)main/shared.c \
+       $(SRCDIR)main/state.c \
+       $(SRCDIR)main/stencil.c \
+       $(SRCDIR)main/syncobj.c \
+       $(SRCDIR)main/texcompress.c \
+       $(SRCDIR)main/texcompress_cpal.c \
+       $(SRCDIR)main/texcompress_rgtc.c \
+       $(SRCDIR)main/texcompress_s3tc.c \
+       $(SRCDIR)main/texcompress_fxt1.c \
+       $(SRCDIR)main/texcompress_etc.c \
+       $(SRCDIR)main/texenv.c \
+       $(SRCDIR)main/texformat.c \
+       $(SRCDIR)main/texgen.c \
+       $(SRCDIR)main/texgetimage.c \
+       $(SRCDIR)main/teximage.c \
+       $(SRCDIR)main/texobj.c \
+       $(SRCDIR)main/texparam.c \
+       $(SRCDIR)main/texstate.c \
+       $(SRCDIR)main/texstorage.c \
+       $(SRCDIR)main/texstore.c \
+       $(SRCDIR)main/texturebarrier.c \
+       $(SRCDIR)main/transformfeedback.c \
+       $(SRCDIR)main/uniforms.c \
+       $(SRCDIR)main/uniform_query.cpp \
+       $(SRCDIR)main/varray.c \
+       $(SRCDIR)main/version.c \
+       $(SRCDIR)main/viewport.c \
+       $(SRCDIR)main/vtxfmt.c \
+       $(BUILDDIR)main/enums.c \
+       $(MAIN_ES_FILES)
+
+MATH_FILES = \
+       $(SRCDIR)math/m_debug_clip.c \
+       $(SRCDIR)math/m_debug_norm.c \
+       $(SRCDIR)math/m_debug_xform.c \
+       $(SRCDIR)math/m_eval.c \
+       $(SRCDIR)math/m_matrix.c \
+       $(SRCDIR)math/m_translate.c \
+       $(SRCDIR)math/m_vector.c
+
+MATH_XFORM_FILES = \
+       $(SRCDIR)math/m_xform.c
+
+SWRAST_FILES = \
+       $(SRCDIR)swrast/s_aaline.c \
+       $(SRCDIR)swrast/s_aatriangle.c \
+       $(SRCDIR)swrast/s_alpha.c \
+       $(SRCDIR)swrast/s_atifragshader.c \
+       $(SRCDIR)swrast/s_bitmap.c \
+       $(SRCDIR)swrast/s_blend.c \
+       $(SRCDIR)swrast/s_blit.c \
+       $(SRCDIR)swrast/s_clear.c \
+       $(SRCDIR)swrast/s_copypix.c \
+       $(SRCDIR)swrast/s_context.c \
+       $(SRCDIR)swrast/s_depth.c \
+       $(SRCDIR)swrast/s_drawpix.c \
+       $(SRCDIR)swrast/s_feedback.c \
+       $(SRCDIR)swrast/s_fog.c \
+       $(SRCDIR)swrast/s_fragprog.c \
+       $(SRCDIR)swrast/s_lines.c \
+       $(SRCDIR)swrast/s_logic.c \
+       $(SRCDIR)swrast/s_masking.c \
+       $(SRCDIR)swrast/s_points.c \
+       $(SRCDIR)swrast/s_renderbuffer.c \
+       $(SRCDIR)swrast/s_span.c \
+       $(SRCDIR)swrast/s_stencil.c \
+       $(SRCDIR)swrast/s_texcombine.c \
+       $(SRCDIR)swrast/s_texfetch.c \
+       $(SRCDIR)swrast/s_texfilter.c \
+       $(SRCDIR)swrast/s_texrender.c \
+       $(SRCDIR)swrast/s_texture.c \
+       $(SRCDIR)swrast/s_triangle.c \
+       $(SRCDIR)swrast/s_zoom.c
+
+SWRAST_SETUP_FILES = \
+       $(SRCDIR)swrast_setup/ss_context.c \
+       $(SRCDIR)swrast_setup/ss_triangle.c
+
+TNL_FILES = \
+       $(SRCDIR)tnl/t_context.c \
+       $(SRCDIR)tnl/t_pipeline.c \
+       $(SRCDIR)tnl/t_draw.c \
+       $(SRCDIR)tnl/t_rasterpos.c \
+       $(SRCDIR)tnl/t_vb_program.c \
+       $(SRCDIR)tnl/t_vb_render.c \
+       $(SRCDIR)tnl/t_vb_texgen.c \
+       $(SRCDIR)tnl/t_vb_texmat.c \
+       $(SRCDIR)tnl/t_vb_vertex.c \
+       $(SRCDIR)tnl/t_vb_fog.c \
+       $(SRCDIR)tnl/t_vb_light.c \
+       $(SRCDIR)tnl/t_vb_normals.c \
+       $(SRCDIR)tnl/t_vb_points.c \
+       $(SRCDIR)tnl/t_vp_build.c \
+       $(SRCDIR)tnl/t_vertex.c \
+       $(SRCDIR)tnl/t_vertex_sse.c \
+       $(SRCDIR)tnl/t_vertex_generic.c
+
+VBO_FILES = \
+       $(SRCDIR)vbo/vbo_context.c \
+       $(SRCDIR)vbo/vbo_exec.c \
+       $(SRCDIR)vbo/vbo_exec_api.c \
+       $(SRCDIR)vbo/vbo_exec_array.c \
+       $(SRCDIR)vbo/vbo_exec_draw.c \
+       $(SRCDIR)vbo/vbo_exec_eval.c \
+       $(SRCDIR)vbo/vbo_noop.c \
+       $(SRCDIR)vbo/vbo_primitive_restart.c \
+       $(SRCDIR)vbo/vbo_rebase.c \
+       $(SRCDIR)vbo/vbo_split.c \
+       $(SRCDIR)vbo/vbo_split_copy.c \
+       $(SRCDIR)vbo/vbo_split_inplace.c \
+       $(SRCDIR)vbo/vbo_save.c \
+       $(SRCDIR)vbo/vbo_save_api.c \
+       $(SRCDIR)vbo/vbo_save_draw.c \
+       $(SRCDIR)vbo/vbo_save_loopback.c
+
+STATETRACKER_FILES = \
+       $(SRCDIR)state_tracker/st_atom.c \
+       $(SRCDIR)state_tracker/st_atom_array.c \
+       $(SRCDIR)state_tracker/st_atom_blend.c \
+       $(SRCDIR)state_tracker/st_atom_clip.c \
+       $(SRCDIR)state_tracker/st_atom_constbuf.c \
+       $(SRCDIR)state_tracker/st_atom_depth.c \
+       $(SRCDIR)state_tracker/st_atom_framebuffer.c \
+       $(SRCDIR)state_tracker/st_atom_msaa.c \
+       $(SRCDIR)state_tracker/st_atom_pixeltransfer.c \
+       $(SRCDIR)state_tracker/st_atom_sampler.c \
+       $(SRCDIR)state_tracker/st_atom_scissor.c \
+       $(SRCDIR)state_tracker/st_atom_shader.c \
+       $(SRCDIR)state_tracker/st_atom_rasterizer.c \
+       $(SRCDIR)state_tracker/st_atom_stipple.c \
+       $(SRCDIR)state_tracker/st_atom_texture.c \
+       $(SRCDIR)state_tracker/st_atom_viewport.c \
+       $(SRCDIR)state_tracker/st_cb_bitmap.c \
+       $(SRCDIR)state_tracker/st_cb_blit.c \
+       $(SRCDIR)state_tracker/st_cb_bufferobjects.c \
+       $(SRCDIR)state_tracker/st_cb_clear.c \
+       $(SRCDIR)state_tracker/st_cb_condrender.c \
+       $(SRCDIR)state_tracker/st_cb_flush.c \
+       $(SRCDIR)state_tracker/st_cb_drawpixels.c \
+       $(SRCDIR)state_tracker/st_cb_drawtex.c \
+       $(SRCDIR)state_tracker/st_cb_eglimage.c \
+       $(SRCDIR)state_tracker/st_cb_fbo.c \
+       $(SRCDIR)state_tracker/st_cb_feedback.c \
+       $(SRCDIR)state_tracker/st_cb_msaa.c \
+       $(SRCDIR)state_tracker/st_cb_program.c \
+       $(SRCDIR)state_tracker/st_cb_queryobj.c \
+       $(SRCDIR)state_tracker/st_cb_rasterpos.c \
+       $(SRCDIR)state_tracker/st_cb_readpixels.c \
+       $(SRCDIR)state_tracker/st_cb_syncobj.c \
+       $(SRCDIR)state_tracker/st_cb_strings.c \
+       $(SRCDIR)state_tracker/st_cb_texture.c \
+       $(SRCDIR)state_tracker/st_cb_texturebarrier.c \
+       $(SRCDIR)state_tracker/st_cb_viewport.c \
+       $(SRCDIR)state_tracker/st_cb_xformfb.c \
+       $(SRCDIR)state_tracker/st_context.c \
+       $(SRCDIR)state_tracker/st_debug.c \
+       $(SRCDIR)state_tracker/st_draw.c \
+       $(SRCDIR)state_tracker/st_draw_feedback.c \
+       $(SRCDIR)state_tracker/st_extensions.c \
+       $(SRCDIR)state_tracker/st_format.c \
+       $(SRCDIR)state_tracker/st_gen_mipmap.c \
+       $(SRCDIR)state_tracker/st_glsl_to_tgsi.cpp \
+       $(SRCDIR)state_tracker/st_manager.c \
+       $(SRCDIR)state_tracker/st_mesa_to_tgsi.c \
+       $(SRCDIR)state_tracker/st_program.c \
+       $(SRCDIR)state_tracker/st_texture.c
+
+PROGRAM_FILES = \
+       $(SRCDIR)program/arbprogparse.c \
+       $(SRCDIR)program/prog_hash_table.c \
+       $(SRCDIR)program/ir_to_mesa.cpp \
+       $(SRCDIR)program/program.c \
+       $(SRCDIR)program/program_parse_extra.c \
+       $(SRCDIR)program/prog_cache.c \
+       $(SRCDIR)program/prog_execute.c \
+       $(SRCDIR)program/prog_instruction.c \
+       $(SRCDIR)program/prog_noise.c \
+       $(SRCDIR)program/prog_optimize.c \
+       $(SRCDIR)program/prog_opt_constant_fold.c \
+       $(SRCDIR)program/prog_parameter.c \
+       $(SRCDIR)program/prog_parameter_layout.c \
+       $(SRCDIR)program/prog_print.c \
+       $(SRCDIR)program/prog_statevars.c \
+       $(SRCDIR)program/programopt.c \
+       $(SRCDIR)program/register_allocate.c \
+       $(SRCDIR)program/sampler.cpp \
+       $(SRCDIR)program/string_to_uint_map.cpp \
+       $(SRCDIR)program/symbol_table.c \
+       $(BUILDDIR)program/lex.yy.c \
+       $(BUILDDIR)program/program_parse.tab.c
+
+ASM_C_FILES =  \
+       $(SRCDIR)x86/common_x86.c \
+       $(SRCDIR)x86/x86_xform.c \
+       $(SRCDIR)x86/3dnow.c \
+       $(SRCDIR)x86/sse.c \
+       $(SRCDIR)x86/rtasm/x86sse.c \
+       $(SRCDIR)sparc/sparc.c \
+       $(SRCDIR)x86-64/x86-64.c
+
+X86_FILES =                    \
+       $(SRCDIR)x86/common_x86_asm.S   \
+       $(SRCDIR)x86/x86_xform2.S       \
+       $(SRCDIR)x86/x86_xform3.S       \
+       $(SRCDIR)x86/x86_xform4.S       \
+       $(SRCDIR)x86/x86_cliptest.S     \
+       $(SRCDIR)x86/mmx_blend.S                \
+       $(SRCDIR)x86/3dnow_xform1.S     \
+       $(SRCDIR)x86/3dnow_xform2.S     \
+       $(SRCDIR)x86/3dnow_xform3.S     \
+       $(SRCDIR)x86/3dnow_xform4.S     \
+       $(SRCDIR)x86/3dnow_normal.S     \
+       $(SRCDIR)x86/sse_xform1.S       \
+       $(SRCDIR)x86/sse_xform2.S       \
+       $(SRCDIR)x86/sse_xform3.S       \
+       $(SRCDIR)x86/sse_xform4.S       \
+       $(SRCDIR)x86/sse_normal.S       \
+       $(SRCDIR)x86/read_rgba_span_x86.S
+
+X86_64_FILES =         \
+       $(SRCDIR)x86-64/xform4.S
+
+SPARC_FILES =                  \
+       $(SRCDIR)sparc/sparc_clip.S     \
+       $(SRCDIR)sparc/norm.S           \
+       $(SRCDIR)sparc/xform.S
+
+COMMON_DRIVER_FILES =                  \
+       $(SRCDIR)drivers/common/driverfuncs.c   \
+       $(SRCDIR)drivers/common/meta.c
+
+
+# Sources for building non-Gallium drivers
+MESA_FILES = \
+       $(MAIN_FILES)           \
+       $(MATH_FILES)           \
+       $(MATH_XFORM_FILES)     \
+       $(VBO_FILES)            \
+       $(TNL_FILES)            \
+       $(SWRAST_FILES) \
+       $(SWRAST_SETUP_FILES)   \
+       $(COMMON_DRIVER_FILES)\
+       $(ASM_C_FILES)
+
+# Sources for building Gallium drivers
+MESA_GALLIUM_FILES = \
+       $(MAIN_FILES)           \
+       $(MATH_FILES)           \
+       $(VBO_FILES)            \
+       $(STATETRACKER_FILES)   \
+       $(SRCDIR)x86/common_x86.c
+
+### Include directories
+
+INCLUDE_DIRS = \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src/glsl \
+       -I$(top_builddir)/src/glsl \
+       -I$(top_srcdir)/src/glsl/glcpp \
+       -I$(top_srcdir)/src/mesa \
+       -I$(top_builddir)/src/mesa \
+       -I$(top_srcdir)/src/mesa/main \
+       -I$(top_builddir)/src/mesa/main \
+       -I$(top_srcdir)/src/mapi \
+       -I$(top_builddir)/src/mapi \
+       -I$(top_srcdir)/src/gallium/include \
+       -I$(top_srcdir)/src/gallium/auxiliary

diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am
index 753548e25c3a49942812d7f13bdae66b2682c314..dce51704635c8f78199681b5ecab8640c98b7b9b 100644 (file)
--- a/src/mesa/libdricore/Makefile.am
+++ b/src/mesa/libdricore/Makefile.am
@@ -21,7 +21,7 @@
 
 SRCDIR=$(top_srcdir)/src/mesa/
 BUILDDIR=$(top_builddir)/src/mesa/
-include ../sources.mak
+include ../Makefile.sources
 include ../../glsl/Makefile.sources
 
 noinst_PROGRAMS =

diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk
index 51362e0ebb76fba090fb4ada4b1575b53751f6a7..3f974ea27290be9e4b0bd5350b89567c81c6af4b 100644 (file)
--- a/src/mesa/program/Android.mk
+++ b/src/mesa/program/Android.mk
@@ -38,7 +38,7 @@ endef
 
 # Import the following variables:
 #     PROGRAM_FILES
-include $(MESA_TOP)/src/mesa/sources.mak
+include $(MESA_TOP)/src/mesa/Makefile.sources
 
 include $(CLEAR_VARS)
 
@@ -49,7 +49,7 @@ intermediates := $(call local-intermediates-dir)
 
 MESA_ENABLED_APIS := ES1 ES2
 
-# TODO(chadv): In sources.mak, move these vars to a different list so we can
+# TODO(chadv): In Makefile.sources, move these vars to a different list so we can
 # remove this kludge.
 generated_sources_basenames := \
        lex.yy.c \

diff --git a/src/mesa/program/Makefile.am b/src/mesa/program/Makefile.am
index 1b820465892aac44981fe0252e7c02eb5d1427a2..b0e9eff55cfeb36a1cb3abb8a402dff60ace8789 100644 (file)
--- a/src/mesa/program/Makefile.am
+++ b/src/mesa/program/Makefile.am
@@ -19,7 +19,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-include ../sources.mak
+include ../Makefile.sources
 
 AM_CPPFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS)
 AM_CFLAGS = $(VISIBILITY_CFLAGS)

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
deleted file mode 100644 (file)
index a5c1f5d..0000000
--- a/src/mesa/sources.mak
+++ /dev/null
@@ -1,350 +0,0 @@
-### Lists of source files, included by Makefiles
-
-# This file is among different build systems. SRCDIR must be defined with
-# a trailing slash because the Android build system leaves it undefined.
-
-# this is part of MAIN_FILES
-MAIN_ES_FILES = \
-       $(SRCDIR)main/es1_conversion.c
-
-MAIN_FILES = \
-       $(SRCDIR)main/api_arrayelt.c \
-       $(BUILDDIR)main/api_exec.c \
-       $(SRCDIR)main/api_loopback.c \
-       $(SRCDIR)main/api_validate.c \
-       $(SRCDIR)main/accum.c \
-       $(SRCDIR)main/arbprogram.c \
-       $(SRCDIR)main/atifragshader.c \
-       $(SRCDIR)main/attrib.c \
-       $(SRCDIR)main/arrayobj.c \
-       $(SRCDIR)main/blend.c \
-       $(SRCDIR)main/bufferobj.c \
-       $(SRCDIR)main/buffers.c \
-       $(SRCDIR)main/clear.c \
-       $(SRCDIR)main/clip.c \
-       $(SRCDIR)main/colortab.c \
-       $(SRCDIR)main/condrender.c \
-       $(SRCDIR)main/context.c \
-       $(SRCDIR)main/convolve.c \
-       $(SRCDIR)main/cpuinfo.c \
-       $(SRCDIR)main/debug.c \
-       $(SRCDIR)main/depth.c \
-       $(SRCDIR)main/dlist.c \
-       $(SRCDIR)main/drawpix.c \
-       $(SRCDIR)main/drawtex.c \
-       $(SRCDIR)main/enable.c \
-       $(SRCDIR)main/errors.c \
-       $(SRCDIR)main/eval.c \
-       $(SRCDIR)main/execmem.c \
-       $(SRCDIR)main/extensions.c \
-       $(SRCDIR)main/fbobject.c \
-       $(SRCDIR)main/feedback.c \
-       $(SRCDIR)main/ffvertex_prog.c \
-       $(SRCDIR)main/ff_fragment_shader.cpp \
-       $(SRCDIR)main/fog.c \
-       $(SRCDIR)main/formatquery.c \
-       $(SRCDIR)main/formats.c \
-       $(SRCDIR)main/format_pack.c \
-       $(SRCDIR)main/format_unpack.c \
-       $(SRCDIR)main/framebuffer.c \
-       $(SRCDIR)main/get.c \
-       $(SRCDIR)main/getstring.c \
-       $(SRCDIR)main/glformats.c \
-       $(SRCDIR)main/hash.c \
-       $(SRCDIR)main/hash_table.c \
-       $(SRCDIR)main/hint.c \
-       $(SRCDIR)main/histogram.c \
-       $(SRCDIR)main/image.c \
-       $(SRCDIR)main/imports.c \
-       $(SRCDIR)main/light.c \
-       $(SRCDIR)main/lines.c \
-       $(SRCDIR)main/matrix.c \
-       $(SRCDIR)main/mipmap.c \
-       $(SRCDIR)main/mm.c \
-       $(SRCDIR)main/multisample.c \
-       $(SRCDIR)main/pack.c \
-       $(SRCDIR)main/pbo.c \
-       $(SRCDIR)main/pixel.c \
-       $(SRCDIR)main/pixelstore.c \
-       $(SRCDIR)main/pixeltransfer.c \
-       $(SRCDIR)main/points.c \
-       $(SRCDIR)main/polygon.c \
-       $(SRCDIR)main/queryobj.c \
-       $(SRCDIR)main/querymatrix.c \
-       $(SRCDIR)main/rastpos.c \
-       $(SRCDIR)main/readpix.c \
-       $(SRCDIR)main/remap.c \
-       $(SRCDIR)main/renderbuffer.c \
-       $(SRCDIR)main/samplerobj.c \
-       $(SRCDIR)main/scissor.c \
-       $(SRCDIR)main/set.c \
-       $(SRCDIR)main/shaderapi.c \
-       $(SRCDIR)main/shaderobj.c \
-       $(SRCDIR)main/shader_query.cpp \
-       $(SRCDIR)main/shared.c \
-       $(SRCDIR)main/state.c \
-       $(SRCDIR)main/stencil.c \
-       $(SRCDIR)main/syncobj.c \
-       $(SRCDIR)main/texcompress.c \
-       $(SRCDIR)main/texcompress_cpal.c \
-       $(SRCDIR)main/texcompress_rgtc.c \
-       $(SRCDIR)main/texcompress_s3tc.c \
-       $(SRCDIR)main/texcompress_fxt1.c \
-       $(SRCDIR)main/texcompress_etc.c \
-       $(SRCDIR)main/texenv.c \
-       $(SRCDIR)main/texformat.c \
-       $(SRCDIR)main/texgen.c \
-       $(SRCDIR)main/texgetimage.c \
-       $(SRCDIR)main/teximage.c \
-       $(SRCDIR)main/texobj.c \
-       $(SRCDIR)main/texparam.c \
-       $(SRCDIR)main/texstate.c \
-       $(SRCDIR)main/texstorage.c \
-       $(SRCDIR)main/texstore.c \
-       $(SRCDIR)main/texturebarrier.c \
-       $(SRCDIR)main/transformfeedback.c \
-       $(SRCDIR)main/uniforms.c \
-       $(SRCDIR)main/uniform_query.cpp \
-       $(SRCDIR)main/varray.c \
-       $(SRCDIR)main/version.c \
-       $(SRCDIR)main/viewport.c \
-       $(SRCDIR)main/vtxfmt.c \
-       $(BUILDDIR)main/enums.c \
-       $(MAIN_ES_FILES)
-
-MATH_FILES = \
-       $(SRCDIR)math/m_debug_clip.c \
-       $(SRCDIR)math/m_debug_norm.c \
-       $(SRCDIR)math/m_debug_xform.c \
-       $(SRCDIR)math/m_eval.c \
-       $(SRCDIR)math/m_matrix.c \
-       $(SRCDIR)math/m_translate.c \
-       $(SRCDIR)math/m_vector.c
-
-MATH_XFORM_FILES = \
-       $(SRCDIR)math/m_xform.c
-
-SWRAST_FILES = \
-       $(SRCDIR)swrast/s_aaline.c \
-       $(SRCDIR)swrast/s_aatriangle.c \
-       $(SRCDIR)swrast/s_alpha.c \
-       $(SRCDIR)swrast/s_atifragshader.c \
-       $(SRCDIR)swrast/s_bitmap.c \
-       $(SRCDIR)swrast/s_blend.c \
-       $(SRCDIR)swrast/s_blit.c \
-       $(SRCDIR)swrast/s_clear.c \
-       $(SRCDIR)swrast/s_copypix.c \
-       $(SRCDIR)swrast/s_context.c \
-       $(SRCDIR)swrast/s_depth.c \
-       $(SRCDIR)swrast/s_drawpix.c \
-       $(SRCDIR)swrast/s_feedback.c \
-       $(SRCDIR)swrast/s_fog.c \
-       $(SRCDIR)swrast/s_fragprog.c \
-       $(SRCDIR)swrast/s_lines.c \
-       $(SRCDIR)swrast/s_logic.c \
-       $(SRCDIR)swrast/s_masking.c \
-       $(SRCDIR)swrast/s_points.c \
-       $(SRCDIR)swrast/s_renderbuffer.c \
-       $(SRCDIR)swrast/s_span.c \
-       $(SRCDIR)swrast/s_stencil.c \
-       $(SRCDIR)swrast/s_texcombine.c \
-       $(SRCDIR)swrast/s_texfetch.c \
-       $(SRCDIR)swrast/s_texfilter.c \
-       $(SRCDIR)swrast/s_texrender.c \
-       $(SRCDIR)swrast/s_texture.c \
-       $(SRCDIR)swrast/s_triangle.c \
-       $(SRCDIR)swrast/s_zoom.c
-
-SWRAST_SETUP_FILES = \
-       $(SRCDIR)swrast_setup/ss_context.c \
-       $(SRCDIR)swrast_setup/ss_triangle.c
-
-TNL_FILES = \
-       $(SRCDIR)tnl/t_context.c \
-       $(SRCDIR)tnl/t_pipeline.c \
-       $(SRCDIR)tnl/t_draw.c \
-       $(SRCDIR)tnl/t_rasterpos.c \
-       $(SRCDIR)tnl/t_vb_program.c \
-       $(SRCDIR)tnl/t_vb_render.c \
-       $(SRCDIR)tnl/t_vb_texgen.c \
-       $(SRCDIR)tnl/t_vb_texmat.c \
-       $(SRCDIR)tnl/t_vb_vertex.c \
-       $(SRCDIR)tnl/t_vb_fog.c \
-       $(SRCDIR)tnl/t_vb_light.c \
-       $(SRCDIR)tnl/t_vb_normals.c \
-       $(SRCDIR)tnl/t_vb_points.c \
-       $(SRCDIR)tnl/t_vp_build.c \
-       $(SRCDIR)tnl/t_vertex.c \
-       $(SRCDIR)tnl/t_vertex_sse.c \
-       $(SRCDIR)tnl/t_vertex_generic.c
-
-VBO_FILES = \
-       $(SRCDIR)vbo/vbo_context.c \
-       $(SRCDIR)vbo/vbo_exec.c \
-       $(SRCDIR)vbo/vbo_exec_api.c \
-       $(SRCDIR)vbo/vbo_exec_array.c \
-       $(SRCDIR)vbo/vbo_exec_draw.c \
-       $(SRCDIR)vbo/vbo_exec_eval.c \
-       $(SRCDIR)vbo/vbo_noop.c \
-       $(SRCDIR)vbo/vbo_primitive_restart.c \
-       $(SRCDIR)vbo/vbo_rebase.c \
-       $(SRCDIR)vbo/vbo_split.c \
-       $(SRCDIR)vbo/vbo_split_copy.c \
-       $(SRCDIR)vbo/vbo_split_inplace.c \
-       $(SRCDIR)vbo/vbo_save.c \
-       $(SRCDIR)vbo/vbo_save_api.c \
-       $(SRCDIR)vbo/vbo_save_draw.c \
-       $(SRCDIR)vbo/vbo_save_loopback.c
-
-STATETRACKER_FILES = \
-       $(SRCDIR)state_tracker/st_atom.c \
-       $(SRCDIR)state_tracker/st_atom_array.c \
-       $(SRCDIR)state_tracker/st_atom_blend.c \
-       $(SRCDIR)state_tracker/st_atom_clip.c \
-       $(SRCDIR)state_tracker/st_atom_constbuf.c \
-       $(SRCDIR)state_tracker/st_atom_depth.c \
-       $(SRCDIR)state_tracker/st_atom_framebuffer.c \
-       $(SRCDIR)state_tracker/st_atom_msaa.c \
-       $(SRCDIR)state_tracker/st_atom_pixeltransfer.c \
-       $(SRCDIR)state_tracker/st_atom_sampler.c \
-       $(SRCDIR)state_tracker/st_atom_scissor.c \
-       $(SRCDIR)state_tracker/st_atom_shader.c \
-       $(SRCDIR)state_tracker/st_atom_rasterizer.c \
-       $(SRCDIR)state_tracker/st_atom_stipple.c \
-       $(SRCDIR)state_tracker/st_atom_texture.c \
-       $(SRCDIR)state_tracker/st_atom_viewport.c \
-       $(SRCDIR)state_tracker/st_cb_bitmap.c \
-       $(SRCDIR)state_tracker/st_cb_blit.c \
-       $(SRCDIR)state_tracker/st_cb_bufferobjects.c \
-       $(SRCDIR)state_tracker/st_cb_clear.c \
-       $(SRCDIR)state_tracker/st_cb_condrender.c \
-       $(SRCDIR)state_tracker/st_cb_flush.c \
-       $(SRCDIR)state_tracker/st_cb_drawpixels.c \
-       $(SRCDIR)state_tracker/st_cb_drawtex.c \
-       $(SRCDIR)state_tracker/st_cb_eglimage.c \
-       $(SRCDIR)state_tracker/st_cb_fbo.c \
-       $(SRCDIR)state_tracker/st_cb_feedback.c \
-       $(SRCDIR)state_tracker/st_cb_msaa.c \
-       $(SRCDIR)state_tracker/st_cb_program.c \
-       $(SRCDIR)state_tracker/st_cb_queryobj.c \
-       $(SRCDIR)state_tracker/st_cb_rasterpos.c \
-       $(SRCDIR)state_tracker/st_cb_readpixels.c \
-       $(SRCDIR)state_tracker/st_cb_syncobj.c \
-       $(SRCDIR)state_tracker/st_cb_strings.c \
-       $(SRCDIR)state_tracker/st_cb_texture.c \
-       $(SRCDIR)state_tracker/st_cb_texturebarrier.c \
-       $(SRCDIR)state_tracker/st_cb_viewport.c \
-       $(SRCDIR)state_tracker/st_cb_xformfb.c \
-       $(SRCDIR)state_tracker/st_context.c \
-       $(SRCDIR)state_tracker/st_debug.c \
-       $(SRCDIR)state_tracker/st_draw.c \
-       $(SRCDIR)state_tracker/st_draw_feedback.c \
-       $(SRCDIR)state_tracker/st_extensions.c \
-       $(SRCDIR)state_tracker/st_format.c \
-       $(SRCDIR)state_tracker/st_gen_mipmap.c \
-       $(SRCDIR)state_tracker/st_glsl_to_tgsi.cpp \
-       $(SRCDIR)state_tracker/st_manager.c \
-       $(SRCDIR)state_tracker/st_mesa_to_tgsi.c \
-       $(SRCDIR)state_tracker/st_program.c \
-       $(SRCDIR)state_tracker/st_texture.c
-
-PROGRAM_FILES = \
-       $(SRCDIR)program/arbprogparse.c \
-       $(SRCDIR)program/prog_hash_table.c \
-       $(SRCDIR)program/ir_to_mesa.cpp \
-       $(SRCDIR)program/program.c \
-       $(SRCDIR)program/program_parse_extra.c \
-       $(SRCDIR)program/prog_cache.c \
-       $(SRCDIR)program/prog_execute.c \
-       $(SRCDIR)program/prog_instruction.c \
-       $(SRCDIR)program/prog_noise.c \
-       $(SRCDIR)program/prog_optimize.c \
-       $(SRCDIR)program/prog_opt_constant_fold.c \
-       $(SRCDIR)program/prog_parameter.c \
-       $(SRCDIR)program/prog_parameter_layout.c \
-       $(SRCDIR)program/prog_print.c \
-       $(SRCDIR)program/prog_statevars.c \
-       $(SRCDIR)program/programopt.c \
-       $(SRCDIR)program/register_allocate.c \
-       $(SRCDIR)program/sampler.cpp \
-       $(SRCDIR)program/string_to_uint_map.cpp \
-       $(SRCDIR)program/symbol_table.c \
-       $(BUILDDIR)program/lex.yy.c \
-       $(BUILDDIR)program/program_parse.tab.c
-
-ASM_C_FILES =  \
-       $(SRCDIR)x86/common_x86.c \
-       $(SRCDIR)x86/x86_xform.c \
-       $(SRCDIR)x86/3dnow.c \
-       $(SRCDIR)x86/sse.c \
-       $(SRCDIR)x86/rtasm/x86sse.c \
-       $(SRCDIR)sparc/sparc.c \
-       $(SRCDIR)x86-64/x86-64.c
-
-X86_FILES =                    \
-       $(SRCDIR)x86/common_x86_asm.S   \
-       $(SRCDIR)x86/x86_xform2.S       \
-       $(SRCDIR)x86/x86_xform3.S       \
-       $(SRCDIR)x86/x86_xform4.S       \
-       $(SRCDIR)x86/x86_cliptest.S     \
-       $(SRCDIR)x86/mmx_blend.S                \
-       $(SRCDIR)x86/3dnow_xform1.S     \
-       $(SRCDIR)x86/3dnow_xform2.S     \
-       $(SRCDIR)x86/3dnow_xform3.S     \
-       $(SRCDIR)x86/3dnow_xform4.S     \
-       $(SRCDIR)x86/3dnow_normal.S     \
-       $(SRCDIR)x86/sse_xform1.S       \
-       $(SRCDIR)x86/sse_xform2.S       \
-       $(SRCDIR)x86/sse_xform3.S       \
-       $(SRCDIR)x86/sse_xform4.S       \
-       $(SRCDIR)x86/sse_normal.S       \
-       $(SRCDIR)x86/read_rgba_span_x86.S
-
-X86_64_FILES =         \
-       $(SRCDIR)x86-64/xform4.S
-
-SPARC_FILES =                  \
-       $(SRCDIR)sparc/sparc_clip.S     \
-       $(SRCDIR)sparc/norm.S           \
-       $(SRCDIR)sparc/xform.S
-
-COMMON_DRIVER_FILES =                  \
-       $(SRCDIR)drivers/common/driverfuncs.c   \
-       $(SRCDIR)drivers/common/meta.c
-
-
-# Sources for building non-Gallium drivers
-MESA_FILES = \
-       $(MAIN_FILES)           \
-       $(MATH_FILES)           \
-       $(MATH_XFORM_FILES)     \
-       $(VBO_FILES)            \
-       $(TNL_FILES)            \
-       $(SWRAST_FILES) \
-       $(SWRAST_SETUP_FILES)   \
-       $(COMMON_DRIVER_FILES)\
-       $(ASM_C_FILES)
-
-# Sources for building Gallium drivers
-MESA_GALLIUM_FILES = \
-       $(MAIN_FILES)           \
-       $(MATH_FILES)           \
-       $(VBO_FILES)            \
-       $(STATETRACKER_FILES)   \
-       $(SRCDIR)x86/common_x86.c
-
-### Include directories
-
-INCLUDE_DIRS = \
-       -I$(top_srcdir)/include \
-       -I$(top_srcdir)/src/glsl \
-       -I$(top_builddir)/src/glsl \
-       -I$(top_srcdir)/src/glsl/glcpp \
-       -I$(top_srcdir)/src/mesa \
-       -I$(top_builddir)/src/mesa \
-       -I$(top_srcdir)/src/mesa/main \
-       -I$(top_builddir)/src/mesa/main \
-       -I$(top_srcdir)/src/mapi \
-       -I$(top_builddir)/src/mapi \
-       -I$(top_srcdir)/src/gallium/include \
-       -I$(top_srcdir)/src/gallium/auxiliary