summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2013-01-21 10:25:31 -0800
committerMatt Turner <[email protected]>2013-04-15 12:04:25 -0700
commit3c690524e2ec0fdd6bef6d50897d6879fdb8b53b (patch)
tree3729d9fff2d85fd226dbcb4275e9e0476647c7a6
parentd50343dff1e74c203a9c32279b85ed762907b7ca (diff)
build: Rename sources.mak -> Makefile.sources
For the sake of consistency. Tested-by: Emil Velikov <[email protected]> Reviewed-and-Tested-by: Andreas Boll <[email protected]> Reviewed-by: Jordan Justen <[email protected]>
-rw-r--r--src/glx/apple/Makefile2
-rw-r--r--src/mapi/glapi/Makefile.am4
-rw-r--r--src/mapi/glapi/Makefile.sources (renamed from src/mapi/glapi/sources.mak)2
-rw-r--r--src/mapi/mapi/Makefile.sources (renamed from src/mapi/mapi/sources.mak)2
-rw-r--r--src/mapi/shared-glapi/Makefile.am2
-rw-r--r--src/mapi/vgapi/Makefile.am2
-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
13 files changed, 14 insertions, 14 deletions
diff --git a/src/glx/apple/Makefile b/src/glx/apple/Makefile
index f6faa1ef71c..7dab068b252 100644
--- 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 bdb527d5c5c..cf2602aed0a 100644
--- 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/sources.mak b/src/mapi/glapi/Makefile.sources
index aa8a4d40a9a..58d28c52c90 100644
--- a/src/mapi/glapi/sources.mak
+++ b/src/mapi/glapi/Makefile.sources
@@ -1,4 +1,4 @@
-# src/mapi/glapi/sources.mak
+# src/mapi/glapi/Makefile.sources
GLAPI_SOURCES = \
glapi_dispatch.c \
diff --git a/src/mapi/mapi/sources.mak b/src/mapi/mapi/Makefile.sources
index 56f4afd3efc..a2f6c716984 100644
--- a/src/mapi/mapi/sources.mak
+++ b/src/mapi/mapi/Makefile.sources
@@ -1,4 +1,4 @@
-# src/mapi/mapi/sources.mak
+# src/mapi/mapi/Makefile.sources
#
# mapi may be used in several ways
#
diff --git a/src/mapi/shared-glapi/Makefile.am b/src/mapi/shared-glapi/Makefile.am
index d215c43ad95..2cc5c590548 100644
--- 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 b7abf92a1cc..7d7c581236e 100644
--- 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 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)