make: Fold ASM_CFLAGS into DEFINES.

Every place that uses ASM_FLAGS already uses DEFINES.  Not including
it in DEFINES is just a way to screw up potential users, as I've done
several times while working on the build system.

12 files changed, 5 insertions, 15 deletions

diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am
index 97c5695..409bae0 100644
--- a/src/gallium/drivers/Makefile.am
+++ b/src/gallium/drivers/Makefile.am
@@ -5,7 +5,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/gallium/auxiliary \
 	-I$(top_srcdir)/src/gallium/drivers \
 	$(DEFINES) \
-	$(ASM_FLAGS) \
 	$(PIC_FLAGS)
 
 noinst_LIBRARIES =
diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am
index 11f0d18..3d08611 100644
--- a/src/gallium/drivers/r300/Makefile.am
+++ b/src/gallium/drivers/r300/Makefile.am
@@ -17,7 +17,6 @@ AM_CFLAGS = \
 	$(RADEON_CFLAGS) \
 	$(DEFINES) \
 	$(ARCH_FLAGS) \
-	$(ASM_FLAGS) \
 	$(OPT_FLAGS) \
 	$(PIC_FLAGS)
 
diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
index 31d885a..ed89d2a 100644
--- a/src/gallium/drivers/r600/Makefile.am
+++ b/src/gallium/drivers/r600/Makefile.am
@@ -10,7 +10,6 @@ AM_CFLAGS = \
 	$(RADEON_CFLAGS) \
 	$(DEFINES) \
 	$(ARCH_FLAGS) \
-	$(ASM_FLAGS) \
 	$(OPT_FLAGS) \
 	$(PIC_FLAGS) \
 	$(VISIBILITY_CFLAGS)
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index b0b461f..6ed7166 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -124,10 +124,10 @@ driver_subdirs: $(MESA_LIBS) $(DRICORE_TARGET)
 ######################################################################
 # Assembly subdirs
 asm_subdirs:
-	@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_ASM ; then \
+	@ if echo "$(DEFINES)" | grep -q USE_X86_ASM ; then \
 		(cd x86 && $(MAKE)) || exit 1 ; \
 	fi
-	@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_64_ASM ; then \
+	@ if echo "$(DEFINES)" | grep -q USE_X86_64_ASM ; then \
 		(cd x86 && $(MAKE)) || exit 1 ; \
 		(cd x86-64 && $(MAKE)) || exit 1 ; \
 	fi
diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am
index 27c3e3d..d81bc0e 100644
--- a/src/mesa/drivers/dri/common/Makefile.am
+++ b/src/mesa/drivers/dri/common/Makefile.am
@@ -25,7 +25,6 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/src/mapi \
 	-I$(top_srcdir)/src/mesa/ \
 	$(DEFINES) \
-	$(ASM_FLAGS) \
 	$(API_DEFINES) \
 	$(LIBDRM_CFLAGS)
 
diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am
index 75267e2..7ec4c22 100644
--- a/src/mesa/drivers/dri/i915/Makefile.am
+++ b/src/mesa/drivers/dri/i915/Makefile.am
@@ -36,7 +36,6 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/src/mesa/drivers/dri/intel \
 	-I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
 	$(DEFINES) \
-	$(ASM_FLAGS) \
 	$(API_DEFINES) \
 	$(INTEL_CFLAGS)
 
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index f5dfced..c1526ae 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -35,7 +35,6 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/src/mesa/drivers/dri/intel \
 	-I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
 	$(DEFINES) \
-	$(ASM_FLAGS) \
 	$(API_DEFINES) \
 	$(INTEL_CFLAGS)
 
diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am
index 3a3c0af..82d3804 100644
--- a/src/mesa/drivers/dri/nouveau/Makefile.am
+++ b/src/mesa/drivers/dri/nouveau/Makefile.am
@@ -33,7 +33,6 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/src/mesa/ \
 	-I$(top_srcdir)/src/mesa/drivers/dri/common \
 	$(DEFINES) \
-	$(ASM_FLAGS) \
 	$(API_DEFINES) \
 	$(NOUVEAU_CFLAGS)
 
diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am
index f15dbc0..5ec53de 100644
--- a/src/mesa/drivers/dri/r200/Makefile.am
+++ b/src/mesa/drivers/dri/r200/Makefile.am
@@ -35,7 +35,6 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/src/mesa/drivers/dri/common \
 	-I$(top_srcdir)/src/mesa/drivers/dri/r200/server \
 	$(DEFINES) \
-	$(ASM_FLAGS) \
 	$(API_DEFINES) \
 	$(RADEON_CFLAGS)
 
diff --git a/src/mesa/drivers/dri/radeon/Makefile.am b/src/mesa/drivers/dri/radeon/Makefile.am
index 89b778d..ec2d42e 100644
--- a/src/mesa/drivers/dri/radeon/Makefile.am
+++ b/src/mesa/drivers/dri/radeon/Makefile.am
@@ -35,7 +35,6 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/src/mesa/drivers/dri/common \
 	-I$(top_srcdir)/src/mesa/drivers/dri/radeon/server \
 	$(DEFINES) \
-	$(ASM_FLAGS) \
 	$(API_DEFINES) \
 	$(RADEON_CFLAGS)
 
diff --git a/src/mesa/drivers/dri/swrast/Makefile.am b/src/mesa/drivers/dri/swrast/Makefile.am
index 3dc7c10..16a3441 100644
--- a/src/mesa/drivers/dri/swrast/Makefile.am
+++ b/src/mesa/drivers/dri/swrast/Makefile.am
@@ -34,7 +34,6 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/src/mesa/ \
 	-I$(top_srcdir)/src/mesa/drivers/dri/common \
 	$(DEFINES) \
-	$(ASM_FLAGS) \
 	$(API_DEFINES)
 
 dridir = $(DRI_DRIVER_INSTALL_DIR)
diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am
index 729ddd7..866f8f1 100644
--- a/src/mesa/libdricore/Makefile.am
+++ b/src/mesa/libdricore/Makefile.am
@@ -34,9 +34,9 @@ AM_CPPFLAGS = \
 
 dridir = $(libdir)/dri
 
-AM_CFLAGS = $(CFLAGS_NOVISIBILITY) $(ASM_FLAGS) -DUSE_DRICORE
-AM_CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) $(ASM_FLAGS) -DUSE_DRICORE
-AM_CCASFLAGS = $(CFLAGS_NOVISIBILITY) $(ASM_FLAGS) -DUSE_DRICORE
+AM_CFLAGS = $(CFLAGS_NOVISIBILITY) -DUSE_DRICORE
+AM_CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) -DUSE_DRICORE
+AM_CCASFLAGS = $(CFLAGS_NOVISIBILITY) -DUSE_DRICORE
 
 libdricore_la_SOURCES = \
 	$(MESA_FILES) \