diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Makefile | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/Makefile.am | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/Makefile.am | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.am | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/Makefile.am | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/Makefile.am | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/Makefile.am | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/swrast/Makefile.am | 1 | ||||
| -rw-r--r-- | src/mesa/libdricore/Makefile.am | 6 |
9 files changed, 5 insertions, 12 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index b0b461fddfc..6ed7166ea83 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 27c3e3d4223..d81bc0e3f4d 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 75267e22196..7ec4c223149 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 f5dfced9996..c1526aef835 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 3a3c0af9a71..82d3804f838 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 f15dbc09ac2..5ec53de7d3d 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 89b778d5110..ec2d42e1e01 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 3dc7c104440..16a34413bad 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 729ddd7c33b..866f8f153b6 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) \ |