[virglrenderer-devel] [PATCH 2/4] gallium: Drop Makefile.sources

[Michal Privoznik]

This file has no purpose. It just complicate stuff. It makes it
much more easier to forget to include a file to build or dist.
Drop it. And while I am at it, sort the list of sources so it's
easier to spot a missing .c or .h file.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/gallium/auxiliary/Makefile.am      | 69 ++++++++++++++++++++++------------
 src/gallium/auxiliary/Makefile.sources | 28 --------------
 2 files changed, 46 insertions(+), 51 deletions(-)
 delete mode 100644 src/gallium/auxiliary/Makefile.sources

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 9c24c1b..e87de44 100644
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -1,6 +1,5 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
-include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 noinst_LTLIBRARIES = libgallium.la
@@ -18,23 +17,65 @@ AM_LIBADD = \
 	$(PTHREAD_LIBS)
 
 libgallium_la_SOURCES = \
-	$(C_SOURCES) \
 	$(GENERATED_SOURCES) \
+	cso_cache/cso_cache.c \
+	cso_cache/cso_cache.h \
+	cso_cache/cso_hash.c \
+	cso_cache/cso_hash.h \
+	os/os_memory.h \
+	os/os_memory_aligned.h \
+	os/os_memory_stdc.h \
+	os/os_misc.c \
+	os/os_misc.h \
+	os/os_thread.h \
+	tgsi/tgsi_build.c \
+	tgsi/tgsi_build.h \
+	tgsi/tgsi_dump.c \
+	tgsi/tgsi_dump.h \
+	tgsi/tgsi_info.c \
+	tgsi/tgsi_info.h \
+	tgsi/tgsi_iterate.c \
+	tgsi/tgsi_iterate.h \
+	tgsi/tgsi_opcode_tmp.h \
+	tgsi/tgsi_parse.c \
+	tgsi/tgsi_parse.h \
+	tgsi/tgsi_sanity.c \
+	tgsi/tgsi_sanity.h \
+	tgsi/tgsi_scan.c \
+	tgsi/tgsi_scan.h \
+	tgsi/tgsi_strings.c \
+	tgsi/tgsi_strings.h \
+	tgsi/tgsi_text.c \
+	tgsi/tgsi_text.h \
+	tgsi/tgsi_transform.c \
+	tgsi/tgsi_transform.h \
+	tgsi/tgsi_ureg.c \
+	tgsi/tgsi_ureg.h \
+	tgsi/tgsi_util.c \
+	tgsi/tgsi_util.h \
 	util/rgtc.h \
 	util/u_atomic.h \
+	util/u_bitmask.c \
 	util/u_bitmask.h \
 	util/u_box.h \
+	util/u_cpu_detect.c \
 	util/u_cpu_detect.h \
+	util/u_debug.c \
 	util/u_debug.h \
+	util/u_debug_describe.c \
 	util/u_debug_describe.h \
 	util/u_debug_refcnt.h \
 	util/u_double_list.h \
 	util/u_dual_blend.h \
+	util/u_format.c \
 	util/u_format.h \
 	util/u_format_s3tc.h \
+	util/u_format_table.c \
 	util/u_half.h \
+	util/u_hash_table.c \
 	util/u_hash_table.h \
 	util/u_inlines.h \
+	util/u_math.c \
 	util/u_math.h \
 	util/u_memory.h \
 	util/u_pack_color.h \
@@ -42,28 +83,10 @@ libgallium_la_SOURCES = \
 	util/u_prim.h \
 	util/u_rect.h \
 	util/u_string.h \
+	util/u_surface.c \
 	util/u_surface.h \
-	util/u_texture.h \
-	cso_cache/cso_cache.h \
-	cso_cache/cso_hash.h \
-	tgsi/tgsi_build.h \
-	tgsi/tgsi_dump.h \
-	tgsi/tgsi_info.h \
-	tgsi/tgsi_iterate.h \
-	tgsi/tgsi_opcode_tmp.h \
-	tgsi/tgsi_parse.h \
-	tgsi/tgsi_sanity.h \
-	tgsi/tgsi_scan.h \
-	tgsi/tgsi_strings.h \
-	tgsi/tgsi_text.h \
-	tgsi/tgsi_transform.h \
-	tgsi/tgsi_ureg.h \
-	tgsi/tgsi_util.h \
-	os/os_memory.h \
-	os/os_memory_stdc.h \
-	os/os_memory_aligned.h \
-	os/os_misc.h \
-	os/os_thread.h
+	util/u_texture.c \
+	util/u_texture.h
 
 util/u_format_table.c: $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format_pack.py $(srcdir)/util/u_format_parse.py $(srcdir)/util/u_format.csv
 	$(AM_V_at)$(MKDIR_P) util
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
deleted file mode 100644
index c7bd341..0000000
--- a/src/gallium/auxiliary/Makefile.sources
+++ /dev/null
@@ -1,28 +0,0 @@
-C_SOURCES := \
-	cso_cache/cso_cache.c \
-	cso_cache/cso_hash.c \
-	os/os_misc.c \
-	tgsi/tgsi_build.c \
-	tgsi/tgsi_dump.c \
-	tgsi/tgsi_info.c \
-	tgsi/tgsi_iterate.c \
-	tgsi/tgsi_parse.c \
-	tgsi/tgsi_sanity.c \
-	tgsi/tgsi_scan.c \
-	tgsi/tgsi_strings.c \
-	tgsi/tgsi_text.c \
-	tgsi/tgsi_transform.c \
-	tgsi/tgsi_ureg.c \
-	tgsi/tgsi_util.c \
-	util/u_debug.c \
-	util/u_debug_describe.c \
-	util/u_format.c \
-	util/u_format_table.c \
-	util/u_hash_table.c \
-	util/u_texture.c \
-	util/u_bitmask.c \
-	util/u_cpu_detect.c \
-	util/u_surface.c \
-	util/u_math.c
-
-
-- 
2.4.10