diff --git a/configs/autoconf.in b/configs/autoconf.in index e2d70c63a12..1538d9af9f4 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -34,9 +34,6 @@ LLVM_LIBS = @LLVM_LIBS@ GLW_CFLAGS = @GLW_CFLAGS@ GLUT_CFLAGS = @GLUT_CFLAGS@ -TALLOC_LIBS = @TALLOC_LIBS@ -TALLOC_CFLAGS = @TALLOC_CFLAGS@ - # dlopen DLOPEN_LIBS = @DLOPEN_LIBS@ diff --git a/configs/default b/configs/default index f2aedefc068..9fa2c23d352 100644 --- a/configs/default +++ b/configs/default @@ -82,9 +82,6 @@ GLESv1_CM_LIB_GLOB = $(GLESv1_CM_LIB_NAME)* GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)* VG_LIB_GLOB = $(VG_LIB_NAME)* -TALLOC_LIBS = `pkg-config --libs talloc` -TALLOC_CFLAGS = `pkg-config --cflags talloc` - # Optional assembly language optimization files for libGL MESA_ASM_SOURCES = @@ -119,7 +116,7 @@ EGL_CLIENT_APIS = $(GL_LIB) # Library dependencies #EXTRA_LIB_PATH ?= -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread $(TALLOC_LIBS) +GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread EGL_LIB_DEPS = $(EXTRA_LIB_PATH) -ldl -lpthread OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) GLU_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm diff --git a/configs/linux-dri b/configs/linux-dri index 6f86277c4af..de90f38cfe9 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -45,7 +45,7 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) LIBDRM_LIB = $(shell pkg-config --libs libdrm) -DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl -ltalloc $(LIBDRM_LIB) +DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ -lm -lpthread -ldl $(LIBDRM_LIB) diff --git a/configs/linux-llvm b/configs/linux-llvm index 6aa434032dc..83d2fc37176 100644 --- a/configs/linux-llvm +++ b/configs/linux-llvm @@ -41,4 +41,4 @@ else endif LD = g++ -GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -ltalloc -lstdc++ -ludis86 +GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -lstdc++ -ludis86 diff --git a/configure.ac b/configure.ac index 45c6df7d478..177c635cd50 100644 --- a/configure.ac +++ b/configure.ac @@ -494,10 +494,6 @@ xxlib|xdri|xosmesa) ;; esac -PKG_CHECK_MODULES([TALLOC], [talloc]) -AC_SUBST([TALLOC_LIBS]) -AC_SUBST([TALLOC_CFLAGS]) - dnl dnl Driver specific build directories dnl @@ -609,8 +605,8 @@ xlib) GL_PC_LIB_PRIV="$GL_LIB_DEPS" GL_PC_CFLAGS="$X11_INCLUDES" fi - GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread $TALLOC_LIBS" - GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread $TALLOC_LIBS" + GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread" + GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread" # if static, move the external libraries to the programs # and empty the libraries for libGL @@ -902,7 +898,7 @@ if test "$mesa_driver" = dri; then [AC_MSG_ERROR([Expat required for DRI.])]) # put all the necessary libs together - DRI_LIB_DEPS="$SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS $TALLOC_LIBS" + DRI_LIB_DEPS="$SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS" fi AC_SUBST([DRI_DIRS]) AC_SUBST([EXPAT_INCLUDES]) @@ -975,12 +971,12 @@ case "$DRIVER_DIRS" in *osmesa*) # only link libraries with osmesa if shared if test "$enable_static" = no; then - OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS $TALLOC_LIBS" + OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS" else OSMESA_LIB_DEPS="" fi OSMESA_MESA_DEPS="" - OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS $TALLOC_LIBS" + OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS" ;; esac AC_SUBST([OSMESA_LIB_DEPS]) diff --git a/src/glsl/Makefile b/src/glsl/Makefile index 2bb5ffdc4e9..258a48baf95 100644 --- a/src/glsl/Makefile +++ b/src/glsl/Makefile @@ -85,8 +85,7 @@ CXX_SOURCES = \ s_expression.cpp LIBS = \ - $(TOP)/src/glsl/libglsl.a \ - $(TALLOC_LIBS) + $(TOP)/src/glsl/libglsl.a APPS = glsl_compiler glcpp/glcpp @@ -115,7 +114,6 @@ OBJECTS = \ $(CXX_SOURCES:.cpp=.o) INCLUDES = \ - $(TALLOC_CFLAGS) \ -I. \ -I../mesa \ -I../mapi \ diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 8b0756b84ec..c41c38cba66 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -34,9 +34,9 @@ ES1_CPPFLAGS := -DFEATURE_ES1=1 $(DEFINES) ES2_CPPFLAGS := -DFEATURE_ES2=1 $(DEFINES) # append include dirs -MESA_CPPFLAGS += $(INCLUDE_DIRS) $(TALLOC_CFLAGS) -ES1_CPPFLAGS += -I$(TOP)/src/mapi/es1api $(INCLUDE_DIRS) $(TALLOC_CFLAGS) -ES2_CPPFLAGS += -I$(TOP)/src/mapi/es2api $(INCLUDE_DIRS) $(TALLOC_CFLAGS) +MESA_CPPFLAGS += $(INCLUDE_DIRS) +ES1_CPPFLAGS += -I$(TOP)/src/mapi/es1api $(INCLUDE_DIRS) +ES2_CPPFLAGS += -I$(TOP)/src/mapi/es2api $(INCLUDE_DIRS) # tidy compiler flags CFLAGS := $(filter-out $(DEFINES), $(CFLAGS))