From c87474089d4941e660e1cadde5cdb0716303105c Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 5 Sep 2012 20:29:20 -0700 Subject: [PATCH] Remove configs/{current,default} --- Makefile.am | 18 ---- configs/.gitignore | 2 - configs/current.in | 223 --------------------------------------------- configs/default | 180 ------------------------------------ configure.ac | 3 +- docs/devinfo.html | 2 - 6 files changed, 1 insertion(+), 427 deletions(-) delete mode 100644 configs/.gitignore delete mode 100644 configs/current.in delete mode 100644 configs/default diff --git a/Makefile.am b/Makefile.am index 1f4fcac3a39..ee733339ab8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,23 +33,6 @@ check-local: $(MAKE) -C src/glsl/tests check $(MAKE) -C src/glx/tests check -clean-local: - -@touch $(top_builddir)/configs/current - -@for dir in $(SUBDIRS) ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE) clean) ; \ - fi \ - done - -@test -s $(top_builddir)/configs/current || rm -f $(top_builddir)/configs/current - - - -distclean-local: - -rm -rf lib* - -rm -f $(top_builddir)/configs/current - -find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \ - -name depend -o -name depend.bak ')' -exec rm -f '{}' ';' - .PHONY: doxygen # Rules for making release tarballs @@ -93,7 +76,6 @@ IGNORE_FILES = \ parsers: configure - -@touch $(top_builddir)/configs/current $(MAKE) -C src/glsl glsl_parser.cc glsl_parser.h glsl_lexer.cc $(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h $(MAKE) -C src/mesa/program lex.yy.c program_parse.tab.c program_parse.tab.h diff --git a/configs/.gitignore b/configs/.gitignore deleted file mode 100644 index 97ac5b7326f..00000000000 --- a/configs/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -current -autoconf diff --git a/configs/current.in b/configs/current.in deleted file mode 100644 index 9bd07c1ec68..00000000000 --- a/configs/current.in +++ /dev/null @@ -1,223 +0,0 @@ -# Autoconf configuration - -# Pull in the defaults -include $(TOP)/configs/default - -# This is generated by configure -CONFIG_NAME = autoconf - -# Compiler and flags -CC = @CC@ -CXX = @CXX@ -PIC_FLAGS = @PIC_FLAGS@ -DEFINES = @DEFINES@ -API_DEFINES = @API_DEFINES@ -SHARED_GLAPI = @SHARED_GLAPI@ -CFLAGS_NOVISIBILITY = @CPPFLAGS@ @CFLAGS@ \ - $(PIC_FLAGS) $(DEFINES) -CXXFLAGS_NOVISIBILITY = @CPPFLAGS@ @CXXFLAGS@ \ - $(PIC_FLAGS) $(DEFINES) -CFLAGS = $(CFLAGS_NOVISIBILITY) @VISIBILITY_CFLAGS@ -CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) @VISIBILITY_CXXFLAGS@ -LDFLAGS = @LDFLAGS@ -RADEON_CFLAGS = @RADEON_CFLAGS@ -RADEON_LIBS = @RADEON_LIBS@ -NOUVEAU_CFLAGS = @NOUVEAU_CFLAGS@ -NOUVEAU_LIBS = @NOUVEAU_LIBS@ -INTEL_LIBS = @INTEL_LIBS@ -INTEL_CFLAGS = @INTEL_CFLAGS@ -X11_LIBS = @X11_LIBS@ -X11_CFLAGS = @X11_CFLAGS@ -LLVM_BINDIR = @LLVM_BINDIR@ -LLVM_CFLAGS = @LLVM_CFLAGS@ -LLVM_CPPFLAGS = @LLVM_CPPFLAGS@ -LLVM_CXXFLAGS = @LLVM_CXXFLAGS@ -LLVM_LDFLAGS = @LLVM_LDFLAGS@ -LLVM_LIBDIR = @LLVM_LIBDIR@ -LLVM_LIBS = @LLVM_LIBS@ -LLVM_INCLUDEDIR = @LLVM_INCLUDEDIR@ -GLW_CFLAGS = @GLW_CFLAGS@ -GLX_TLS = @GLX_TLS@ - -# dlopen -DLOPEN_LIBS = @DLOPEN_LIBS@ -CLOCK_LIB = @CLOCK_LIB@ - -# Source selection -MESA_ASM_FILES = @MESA_ASM_FILES@ - -# Misc tools and flags -MAKE = @MAKE@ -SHELL = @SHELL@ -MKLIB_OPTIONS = @MKLIB_OPTIONS@ -MKDEP = @MKDEP@ -MKDEP_OPTIONS = @MKDEP_OPTIONS@ -INSTALL = @INSTALL@ -AWK = @AWK@ -GREP = @GREP@ -NM = @NM@ - -# Perl -PERL = @PERL@ - -# Indent (used for generating dispatch tables) -INDENT = @INDENT@ -INDENT_FLAGS = @INDENT_FLAGS@ - -# Python and flags (generally only needed by the developers) -PYTHON2 = @PYTHON2@ -PYTHON_FLAGS = -t -O -O - -# Flex and Bison for GLSL compiler -FLEX = @LEX@ -BISON = @YACC@ - -# Library names (base name) -GL_LIB = @GL_LIB@ -GLU_LIB = @GLU_LIB@ -GLW_LIB = GLw -OSMESA_LIB = @OSMESA_LIB@ -GLESv1_CM_LIB = GLESv1_CM -GLESv2_LIB = GLESv2 -VG_LIB = OpenVG -GLAPI_LIB = glapi - -# Library names (actual file names) -GL_LIB_NAME = @GL_LIB_NAME@ -GLU_LIB_NAME = @GLU_LIB_NAME@ -GLW_LIB_NAME = @GLW_LIB_NAME@ -OSMESA_LIB_NAME = @OSMESA_LIB_NAME@ -EGL_LIB_NAME = @EGL_LIB_NAME@ -GLESv1_CM_LIB_NAME = @GLESv1_CM_LIB_NAME@ -GLESv2_LIB_NAME = @GLESv2_LIB_NAME@ -VG_LIB_NAME = @VG_LIB_NAME@ -GLAPI_LIB_NAME = @GLAPI_LIB_NAME@ - -# Globs used to install the lib and all symlinks -GL_LIB_GLOB = @GL_LIB_GLOB@ -GLU_LIB_GLOB = @GLU_LIB_GLOB@ -GLW_LIB_GLOB = @GLW_LIB_GLOB@ -EGL_LIB_GLOB = @EGL_LIB_GLOB@ -GLESv1_CM_LIB_GLOB = @GLESv1_CM_LIB_GLOB@ -GLESv2_LIB_GLOB = @GLESv2_LIB_GLOB@ -VG_LIB_GLOB = @VG_LIB_GLOB@ -GLAPI_LIB_GLOB = @GLAPI_LIB_GLOB@ - -# Directories to build -LIB_DIR = @LIB_DIR@ -SRC_DIRS = @SRC_DIRS@ -DRIVER_DIRS = @DRIVER_DIRS@ -GALLIUM_DIRS = @GALLIUM_DIRS@ -GALLIUM_DRIVERS_DIRS = @GALLIUM_DRIVERS_DIRS@ -GALLIUM_WINSYS_DIRS = @GALLIUM_WINSYS_DIRS@ -GALLIUM_TARGET_DIRS = @GALLIUM_TARGET_DIRS@ -GALLIUM_STATE_TRACKERS_DIRS = @GALLIUM_STATE_TRACKERS_DIRS@ -GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a -GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) - -# Driver specific build vars -DRI_DIRS = @DRI_DIRS@ -EGL_PLATFORMS = @EGL_PLATFORMS@ -EGL_CLIENT_APIS = @EGL_CLIENT_APIS@ - -# Dependencies -X11_INCLUDES = @X11_INCLUDES@ - -# GLw motif setup -GLW_SOURCES = @GLW_SOURCES@ -MOTIF_CFLAGS = @MOTIF_CFLAGS@ - -# Library/program dependencies -GL_LIB_DEPS = @GL_LIB_DEPS@ -OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @OSMESA_MESA_DEPS@ \ - @OSMESA_LIB_DEPS@ -EGL_LIB_DEPS = @EGL_LIB_DEPS@ -GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLU_MESA_DEPS@ \ - @GLU_LIB_DEPS@ -GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \ - @GLW_LIB_DEPS@ -GLESv1_CM_LIB_DEPS = @GLESv1_CM_LIB_DEPS@ -GLESv2_LIB_DEPS = @GLESv2_LIB_DEPS@ -VG_LIB_DEPS = @VG_LIB_DEPS@ -GLAPI_LIB_DEPS = @GLAPI_LIB_DEPS@ - -# DRI dependencies -DRI_LIB_DEPS = @DRI_LIB_DEPS@ -GALLIUM_DRI_LIB_DEPS = @GALLIUM_DRI_LIB_DEPS@ -LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ -LIBDRM_LIBS = @LIBDRM_LIBS@ -DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ -GLPROTO_CFLAGS = @GLPROTO_CFLAGS@ -EXPAT_INCLUDES = @EXPAT_INCLUDES@ - -# Autoconf directories -prefix = @prefix@ -exec_prefix = @exec_prefix@ -libdir = @libdir@ -includedir = @includedir@ - -# Installation directories (for make install) -INSTALL_DIR = $(prefix) -INSTALL_LIB_DIR = $(libdir) -INSTALL_INC_DIR = $(includedir) - -# DRI installation directories -DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@ - -# Where libGL will look for DRI hardware drivers -DRI_DRIVER_SEARCH_DIR = @DRI_DRIVER_SEARCH_DIR@ - -# EGL driver install directory -EGL_DRIVER_INSTALL_DIR = @EGL_DRIVER_INSTALL_DIR@ - -# XVMC library install directory -XVMC_LIB_INSTALL_DIR=@XVMC_LIB_INSTALL_DIR@ - -# VDPAU library install directory -VDPAU_LIB_INSTALL_DIR=@VDPAU_LIB_INSTALL_DIR@ - -# VA library install directory -VA_LIB_INSTALL_DIR=@VA_LIB_INSTALL_DIR@ - -# Xorg driver install directory (for xorg state-tracker) -XORG_DRIVER_INSTALL_DIR = @XORG_DRIVER_INSTALL_DIR@ - -# Path to OpenCL C library libclc -LIBCLC_INCLUDEDIR = @LIBCLC_INCLUDEDIR@ -LIBCLC_LIBEXECDIR = @LIBCLC_LIBEXECDIR@ - -# pkg-config substitutions -GL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@ -GL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@ -GL_PC_CFLAGS = @GL_PC_CFLAGS@ -DRI_PC_REQ_PRIV = @DRI_PC_REQ_PRIV@ -GLU_PC_REQ = @GLU_PC_REQ@ -GLU_PC_REQ_PRIV = @GLU_PC_REQ_PRIV@ -GLU_PC_LIB_PRIV = @GLU_PC_LIB_PRIV@ -GLU_PC_CFLAGS = @GLU_PC_CFLAGS@ -GLW_PC_REQ_PRIV = @GLW_PC_REQ_PRIV@ -GLW_PC_LIB_PRIV = @GLW_PC_LIB_PRIV@ -GLW_PC_CFLAGS = @GLW_PC_CFLAGS@ -OSMESA_PC_REQ = @OSMESA_PC_REQ@ -OSMESA_PC_LIB_PRIV = @OSMESA_PC_LIB_PRIV@ -GLESv1_CM_PC_LIB_PRIV = @GLESv1_CM_PC_LIB_PRIV@ -GLESv2_PC_LIB_PRIV = @GLESv2_PC_LIB_PRIV@ -EGL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@ -EGL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@ -EGL_PC_CFLAGS = @GL_PC_CFLAGS@ - -XCB_DRI2_CFLAGS = @XCB_DRI2_CFLAGS@ -XCB_DRI2_LIBS = @XCB_DRI2_LIBS@ -LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@ -LIBUDEV_LIBS = @LIBUDEV_LIBS@ -WAYLAND_CFLAGS = @WAYLAND_CFLAGS@ -WAYLAND_LIBS = @WAYLAND_LIBS@ - -MESA_LLVM = @MESA_LLVM@ - -LLVM_VERSION = @LLVM_VERSION@ - -HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@ - -GALLIUM_PIPE_LOADER_DEFINES = @GALLIUM_PIPE_LOADER_DEFINES@ -GALLIUM_PIPE_LOADER_LIBS = @GALLIUM_PIPE_LOADER_LIBS@ diff --git a/configs/default b/configs/default deleted file mode 100644 index 7b9e1c61a82..00000000000 --- a/configs/default +++ /dev/null @@ -1,180 +0,0 @@ -# Default/template configuration - -# This is included by other config files which may override some -# of these variables. -# Think of this as a base class from which configs are derived. - - -CONFIG_NAME = default - -# Version info -MESA_MAJOR=9 -MESA_MINOR=1 -MESA_TINY=0 -MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY) - -# external projects. This should be useless now that we use libdrm. -DRM_SOURCE_PATH=$(TOP)/../drm - -# Compiler and flags -CC = cc -CXX = CC -CFLAGS = -O -CXXFLAGS = -O -LDFLAGS = -GLU_CFLAGS = -GLX_TLS = no - -# Compiler for building demos/tests/etc -APP_CC = $(CC) -APP_CXX = $(CXX) - -# Misc tools and flags -SHELL = /bin/sh -MKLIB = $(SHELL) $(TOP)/bin/mklib -MKLIB_OPTIONS = -MKDEP = makedepend -MKDEP_OPTIONS = -fdepend -MAKE = make -FLEX = flex -BISON = bison -PKG_CONFIG = pkg-config - -# Use MINSTALL for installing libraries, INSTALL for everything else -MINSTALL = $(SHELL) $(TOP)/bin/minstall -INSTALL = $(MINSTALL) - -# Tools for regenerating glapi (generally only needed by the developers) -PYTHON2 = python -PYTHON_FLAGS = -t -O -O -INDENT = indent -INDENT_FLAGS = -i4 -nut -br -brs -npcs -ce -T GLubyte -T GLbyte -T Bool - -# Library names (base name) -GL_LIB = GL -GLU_LIB = GLU -GLW_LIB = GLw -OSMESA_LIB = OSMesa -EGL_LIB = EGL -GLESv1_CM_LIB = GLESv1_CM -GLESv2_LIB = GLESv2 -VG_LIB = OpenVG -GLAPI_LIB = glapi - -# Library names (actual file names) -GL_LIB_NAME = lib$(GL_LIB).so -GLU_LIB_NAME = lib$(GLU_LIB).so -GLW_LIB_NAME = lib$(GLW_LIB).so -OSMESA_LIB_NAME = lib$(OSMESA_LIB).so -EGL_LIB_NAME = lib$(EGL_LIB).so -GLESv1_CM_LIB_NAME = lib$(GLESv1_CM_LIB).so -GLESv2_LIB_NAME = lib$(GLESv2_LIB).so -VG_LIB_NAME = lib$(VG_LIB).so -GLAPI_LIB_NAME = lib$(GLAPI_LIB).so - -# globs used to install the lib and all symlinks -GL_LIB_GLOB = $(GL_LIB_NAME)* -GLU_LIB_GLOB = $(GLU_LIB_NAME)* -GLW_LIB_GLOB = $(GLW_LIB_NAME)* -EGL_LIB_GLOB = $(EGL_LIB_NAME)* -GLESv1_CM_LIB_GLOB = $(GLESv1_CM_LIB_NAME)* -GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)* -VG_LIB_GLOB = $(VG_LIB_NAME)* -GLAPI_LIB_GLOB = $(GLAPI_LIB_NAME)* - -# Optional assembly language optimization files for libGL -MESA_ASM_FILES = - -# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in -# order to build the Motif widget too) -GLW_SOURCES = GLwDrawA.c -MOTIF_CFLAGS = -I/usr/include/Motif1.2 - - -# Directories to build -LIB_DIR = lib -SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \ - gallium egl gallium/winsys gallium/targets -DRIVER_DIRS = x11 osmesa - -# Gallium directories and -GALLIUM_DIRS = auxiliary drivers state_trackers -GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a -GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad i915 svga r300 nvfx nv50 -GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) -GALLIUM_WINSYS_DIRS = sw sw/xlib -GALLIUM_TARGET_DIRS = libgl-xlib -GALLIUM_STATE_TRACKERS_DIRS = glx vega - -# native platforms EGL should support -EGL_PLATFORMS = x11 -EGL_CLIENT_APIS = $(GL_LIB) - -# Library dependencies -#EXTRA_LIB_PATH ?= -GL_LIB_DEPS = -lX11 -lXext -lm -lpthread -EGL_LIB_DEPS = -ldl -lpthread -OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11 -GLESv1_CM_LIB_DEPS = -lpthread -GLESv2_LIB_DEPS = -lpthread -VG_LIB_DEPS = -lpthread -GLAPI_LIB_DEPS = -lpthread - -# Program dependencies - specific GL libraries added in Makefiles -X11_LIBS = -lX11 - -DLOPEN_LIBS = -ldl - -# Installation directories (for make install) -INSTALL_DIR = /usr/local -INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR) -INSTALL_INC_DIR = $(INSTALL_DIR)/include -DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri - -# Where libGL will look for DRI hardware drivers -DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR) - -# EGL driver install directory -EGL_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/egl - -# Xorg driver install directory (for xorg state-tracker) -XORG_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/xorg/modules/drivers - -# pkg-config substitutions -GL_PC_REQ_PRIV = -GL_PC_LIB_PRIV = -GL_PC_CFLAGS = -DRI_PC_REQ_PRIV = -GLU_PC_REQ = gl -GLU_PC_REQ_PRIV = -GLU_PC_LIB_PRIV = -GLU_PC_CFLAGS = -GLW_PC_REQ_PRIV = -GLW_PC_LIB_PRIV = -GLW_PC_CFLAGS = -OSMESA_PC_REQ = -OSMESA_PC_LIB_PRIV = -GLESv1_CM_PC_REQ_PRIV = -GLESv1_CM_PC_LIB_PRIV = -GLESv1_CM_PC_CFLAGS = -GLESv2_PC_REQ_PRIV = -GLESv2_PC_LIB_PRIV = -GLESv2_PC_CFLAGS = -VG_PC_REQ_PRIV = -VG_PC_LIB_PRIV = -VG_PC_CFLAGS = - -# default targets -# this helps reduce the mismatch between our automake Makefiles and the old -# custom Makefiles while we transition. - -all: default - -am--refresh: - -distclean: clean - -check: -test: diff --git a/configure.ac b/configure.ac index 9553e13a03e..686e1168b60 100644 --- a/configure.ac +++ b/configure.ac @@ -2027,8 +2027,7 @@ CFLAGS="$CFLAGS $USER_CFLAGS" CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS" dnl Substitute the config -AC_CONFIG_FILES([configs/current - Makefile +AC_CONFIG_FILES([Makefile src/Makefile src/egl/Makefile src/egl/drivers/Makefile diff --git a/docs/devinfo.html b/docs/devinfo.html index 8f4aeef5fd8..15a885fcf21 100644 --- a/docs/devinfo.html +++ b/docs/devinfo.html @@ -196,8 +196,6 @@ branch is relevant.

Verify and update version info

-
configs/default
-
MESA_MAJOR, MESA_MINOR and MESA_TINY
Makefile.am
PACKAGE_VERSION
configure.ac
-- 2.30.2