summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2012-06-11 10:25:05 -0700
committerEric Anholt <[email protected]>2012-06-21 09:58:12 -0700
commite426949cf1c328d5686b1048cdcec54a4fbca986 (patch)
tree5e0c596b25bcaf097791394678bb3c363537dbfc /src/gallium
parent07b28af5b57338263e8aef5833e7d5085051a655 (diff)
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.
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/Makefile.am1
-rw-r--r--src/gallium/drivers/r300/Makefile.am1
-rw-r--r--src/gallium/drivers/r600/Makefile.am1
3 files changed, 0 insertions, 3 deletions
diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am
index 97c5695fa15..409bae0955f 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 11f0d18b91f..3d08611752a 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 31d885a3416..ed89d2adfe9 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)