From e426949cf1c328d5686b1048cdcec54a4fbca986 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 11 Jun 2012 10:25:05 -0700 Subject: 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. --- configs/autoconf.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configs') diff --git a/configs/autoconf.in b/configs/autoconf.in index 48f4504a234..6deedaa5e5a 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -11,13 +11,12 @@ CC = @CC@ CXX = @CXX@ OPT_FLAGS = @OPT_FLAGS@ ARCH_FLAGS = @ARCH_FLAGS@ -ASM_FLAGS = @ASM_FLAGS@ PIC_FLAGS = @PIC_FLAGS@ DEFINES = @DEFINES@ API_DEFINES = @API_DEFINES@ SHARED_GLAPI = @SHARED_GLAPI@ CFLAGS_NOVISIBILITY = @CPPFLAGS@ @CFLAGS@ \ - $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) + $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) CXXFLAGS_NOVISIBILITY = @CPPFLAGS@ @CXXFLAGS@ \ $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) CFLAGS = $(CFLAGS_NOVISIBILITY) @VISIBILITY_CFLAGS@ -- cgit v1.2.3