3 files changed, 8 insertions, 29 deletions
diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index 2e360f96410..7d811a539ba 100644
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -13,7 +13,7 @@ OPT_FLAGS = -O
 
 EXPAT_INCLUDES = -I/usr/local/include
 X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
-DEFINES = -DDRI_NEW_INTERFACE_ONLY -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1
+DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER
 CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99  -Wundef -fPIC \
 	-ffast-math $(X11_INCLUDES)
 CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
diff --git a/configs/linux-solo b/configs/linux-solo
index 8a9031a3363..37e13ee557c 100644
--- a/configs/linux-solo
+++ b/configs/linux-solo
@@ -11,20 +11,21 @@ CXX = g++
 WARN_FLAGS = -Wall -Wundef
 OPT_FLAGS  = -O3 -g
 PIC_FLAGS  = -fPIC
-                                                                                
+
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
 ARCH_FLAGS ?=
 
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
-	-DDRI_NEW_INTERFACE_ONLY -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DDRM_USE_MALLOC
+	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DDRM_USE_MALLOC -DIN_DRI_DRIVER
 
-CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
-	 $(ASM_FLAGS) -std=c99 -ffast-math
+CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
+	$(ASM_FLAGS) -std=c99 -ffast-math 
 
 CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 
-ASM_SOURCES =
+
+ASM_SOURCES = 
 
 # Library/program dependencies
 DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -L$(LIB_DIR) -lEGL -l$(GL_LIB) 
diff --git a/configs/linux-solo-ia64 b/configs/linux-solo-ia64
index ec7a794e5a3..b2051fac855 100644
--- a/configs/linux-solo-ia64
+++ b/configs/linux-solo-ia64
@@ -1,29 +1,7 @@
 # Configuration for linux-solo-ia64: Linux DRI hardware drivers for fbdev
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-solo
 
 CONFIG_NAME = linux-solo-ia64
 
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -DDRM_USE_MALLOC
-
-CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math
-
-CXXFLAGS = $(DEFINES) -Wall -O3 -ansi -pedantic -fPIC
-
-
-# Library/program dependencies
-DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
-GL_LIB_DEPS = -lm -lpthread -ldl
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
-
-# Directories
-SRC_DIRS = mesa glx/mini glu glut/mini
-DRIVER_DIRS = dri
-PROGRAM_DIRS = miniglx
-
 DRI_DIRS = fb mach64 mga r128 r200 radeon sis tdfx unichrome