summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/Android.libmesa_dricore.mk2
-rw-r--r--src/mesa/Android.libmesa_st_mesa.mk2
-rw-r--r--src/mesa/Makefile.am2
-rw-r--r--src/mesa/Makefile.sources (renamed from src/mesa/sources.mak)0
-rw-r--r--src/mesa/libdricore/Makefile.am2
-rw-r--r--src/mesa/program/Android.mk4
-rw-r--r--src/mesa/program/Makefile.am2
7 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk
index 093d7a18940..00c06943c0b 100644
--- 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 79914caf17e..e7203c41dfe 100644
--- 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 c341c48e799..14685e76931 100644
--- 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/sources.mak b/src/mesa/Makefile.sources
index a5c1f5dea0e..a5c1f5dea0e 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/Makefile.sources
diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am
index 753548e25c3..dce51704635 100644
--- 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 51362e0ebb7..3f974ea2729 100644
--- 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 1b820465892..b0e9eff55cf 100644
--- 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)