Refactor the linux-dri config files so that linux-dri-x86 inherits from

linux-dri.  Turn on -O by default (-O2 provides a slight improvement in
performance, at a large cost to debuggability).  Turn off -fPIC on x86 by
default.  Turn on -Wall, to catch more stupid mistakes.  This could be both done
cleaner, and done for more config files, but it works for me for now.

diff --git a/configs/linux-dri b/configs/linux-dri
index ac031d5..9f225ad 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -9,11 +9,18 @@ CONFIG_NAME = linux-dri
 CC = gcc
 CXX = g++
 
-CFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -D_GNU_SOURCE -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
-
-CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wall -g -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE 
-
-
+WARN_FLAGS = -Wall
+OPT_FLAGS = -O
+SOURCE_FLAGS = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
+       -D_BSD_SOURCE -D_GNU_SOURCE
+PIC_FLAGS = -fPIC
+
+CFLAGS = -DDRI_NEW_INTERFACE_ONLY $(WARN_FLAGS) -g $(OPT_FLAGS) $(ASM_FLAGS) \
+       -std=c99 $(PIC_FLAGS) -ffast-math $(SOURCE_FLAGS) -DPTHREADS \
+       -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+
+CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY $(WARN_FLAGS) -g $(OPT_FLAGS) -fPIC \
+       $(SOURCE_FLAGS)
 
 ASM_SOURCES = 
 

diff --git a/configs/linux-dri-x86 b/configs/linux-dri-x86
index 04fadb3..e7ce582 100644 (file)
--- a/configs/linux-dri-x86
+++ b/configs/linux-dri-x86
@@ -1,35 +1,12 @@
 # -*-makefile-*-
 # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-dri
 
 CONFIG_NAME = linux-dri-x86
 
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-CFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -D_GNU_SOURCE -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
-
-CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wall -g -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE 
+# Unnecessary on x86, generally.
+PIC_FLAGS = 
 
+ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 ASM_SOURCES = $(X86_SOURCES)
-
-# Library/program dependencies
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -lexpat -ldl
-
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-
-
-# Directories
-SRC_DIRS = mesa glu glut/glx glw
-DRIVER_DIRS = dri
-PROGRAM_DIRS = 
-WINDOW_SYSTEM=dri
-
-# ffb, gamma, and sis are missing because they have
-# not be converted to use the new interface.
-#
-DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon tdfx unichrome savage
-