Update linux-profile config.

diff --git a/Makefile b/Makefile
index 4bd340f21208f934f62a9bcdb34dbd98b78ca5c7..f65aa60d5730fd1c4890b557487bf78c52ac00f9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -115,6 +115,7 @@ linux-osmesa16-static \
 linux-osmesa32 \
 linux-ppc \
 linux-ppc-static \
+linux-profile \
 linux-solo \
 linux-solo-x86 \
 linux-solo-ia64 \

diff --git a/configs/linux-profile b/configs/linux-profile
index 75b245779afb0f4fb5903c12b611c875923a8069..3efdcf5e057dbdb815e5f923544b1ecbaf87f28d 100644 (file)
--- a/configs/linux-profile
+++ b/configs/linux-profile
@@ -1,29 +1,8 @@
 # Configuration for profiling on Linux with gprof
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-static
 
 CONFIG_NAME = linux-profile
 
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-CFLAGS = -pg -O -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG
-
-CXXFLAGS = -pg -O -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG
-
-GLUT_CFLAGS = -fexceptions
-
-# Need to have -L/usr/X11R6/lib in these:
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11
-
-# Need to make static libs for profiling:
-MKLIB_OPTIONS = -static
-GL_LIB_NAME = lib$(GL_LIB).a
-GLU_LIB_NAME = lib$(GLU_LIB).a
-GLUT_LIB_NAME = lib$(GLUT_LIB).a
-GLW_LIB_NAME = lib$(GLW_LIB).a
-OSMESA_LIB_NAME = lib$(OSMesa).a
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
+OPT_FLAGS = -pg -g -O2 -DNDEBUG
+DEFINES += -DNDEBUG

diff --git a/configs/linux-static b/configs/linux-static
index 85141ea643f6d28f068be3edda348fc4b89bb863..d5fbe9cf6511550821e69c1401b906ab46663d81 100644 (file)
--- a/configs/linux-static
+++ b/configs/linux-static
@@ -21,6 +21,7 @@ GLUT_LIB_DEPS =
 GLW_LIB_DEPS = 
 
 # Need to specify all libraries we may need
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm \
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -Wl,--start-group \
+       -l$(GL_LIB) $(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a -Wl,--end-group -lm \
        -L/usr/X11R6/lib/ -lX11 -lXmu -lXi -lpthread