From 45e3694d529b052f4122262c9bdff5476219b2b4 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 23 Jan 2012 08:33:10 +0100 Subject: git update libX11 mesa libxcb xkeyboard-config 23 jan 2012 --- mesalib/src/mesa/drivers/dri/Makefile | 55 ------------------- mesalib/src/mesa/drivers/dri/Makefile.defines | 27 ---------- mesalib/src/mesa/drivers/dri/Makefile.targets | 78 --------------------------- mesalib/src/mesa/drivers/dri/dri.pc.in | 10 ++-- mesalib/src/mesa/drivers/dri/swrast/Makefile | 27 ---------- 5 files changed, 5 insertions(+), 192 deletions(-) delete mode 100644 mesalib/src/mesa/drivers/dri/Makefile delete mode 100644 mesalib/src/mesa/drivers/dri/Makefile.defines delete mode 100644 mesalib/src/mesa/drivers/dri/Makefile.targets delete mode 100644 mesalib/src/mesa/drivers/dri/swrast/Makefile (limited to 'mesalib/src/mesa/drivers') diff --git a/mesalib/src/mesa/drivers/dri/Makefile b/mesalib/src/mesa/drivers/dri/Makefile deleted file mode 100644 index 264648c3f..000000000 --- a/mesalib/src/mesa/drivers/dri/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# src/mesa/drivers/dri/Makefile - -TOP = ../../../.. - -include $(TOP)/configs/current - - - -default: $(TOP)/$(LIB_DIR) subdirs dri.pc - - -$(TOP)/$(LIB_DIR): - -mkdir $(TOP)/$(LIB_DIR) - - -subdirs: - @for dir in $(DRI_DIRS) ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE)) || exit 1 ; \ - fi \ - done - -pcedit = sed \ - -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \ - -e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \ - -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \ - -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \ - -e 's,@DRI_DRIVER_DIR@,$(DRI_DRIVER_INSTALL_DIR),' \ - -e 's,@DRI_PC_REQ_PRIV@,$(DRI_PC_REQ_PRIV),' - -dri.pc: dri.pc.in - $(pcedit) $< > $@ - - -install: dri.pc - @for dir in $(DRI_DIRS) ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE) install) || exit 1 ; \ - fi \ - done - $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal - $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \ - $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig - $(INSTALL) -m 0644 dri.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig - - -clean: - -@for dir in $(DRI_DIRS) ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE) clean) ; \ - fi \ - done - -rm -f common/*.o - -rm -f *.pc diff --git a/mesalib/src/mesa/drivers/dri/Makefile.defines b/mesalib/src/mesa/drivers/dri/Makefile.defines deleted file mode 100644 index 6ff8df5c0..000000000 --- a/mesalib/src/mesa/drivers/dri/Makefile.defines +++ /dev/null @@ -1,27 +0,0 @@ -# -*-makefile-*- - -# Import mesa_dri_common_* -include ../common/Makefile.sources - -COMMON_GALLIUM_SOURCES = \ - $(addprefix ../common/, $(mesa_dri_common_gallium_SOURCES)) - -COMMON_SOURCES = \ - $(addprefix ../common/, $(mesa_dri_common_SOURCES)) - -INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES) - -OBJECTS = $(C_SOURCES:.c=.o) \ - $(CXX_SOURCES:.cpp=.o) \ - $(ASM_SOURCES:.S=.o) - - -### Include directories -SHARED_INCLUDES = \ - -I. \ - -Iserver \ - $(addprefix -I$(TOP)/, $(mesa_dri_common_INCLUDES)) \ - $(LIBDRM_CFLAGS) - -INCLUDES += $(API_DEFINES) -CXXFLAGS += $(API_DEFINES) diff --git a/mesalib/src/mesa/drivers/dri/Makefile.targets b/mesalib/src/mesa/drivers/dri/Makefile.targets deleted file mode 100644 index 436b2a3c4..000000000 --- a/mesalib/src/mesa/drivers/dri/Makefile.targets +++ /dev/null @@ -1,78 +0,0 @@ -# -*-makefile-*- - -##### RULES ##### - -.c.o: - $(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DRIVER_DEFINES) $< -o $@ - -.cpp.o: - $(CC) -c $(INCLUDES) $(DRI_CXXFLAGS) $(DRIVER_DEFINES) $< -o $@ - -.S.o: - $(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DRIVER_DEFINES) $< -o $@ - - -#### TARGETS ##### - -default: subdirs lib - - -.PHONY: lib -lib: symlinks subdirs depend - @$(MAKE) $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME) - -$(LIBNAME): $(OBJECTS) $(EXTRA_MODULES) $(MESA_MODULES) Makefile \ - $(TOP)/src/mesa/drivers/dri/Makefile.targets $(TOP)/src/mesa/drivers/dri/common/dri_test.o - $(MKLIB) -o $@.tmp -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \ - $(OBJECTS) $(EXTRA_MODULES) $(DRI_LIB_DEPS) - $(CXX) $(CFLAGS) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS) - @rm -f $@.test - mv -f $@.tmp $@ - - -$(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME) - $(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR) - - -# If the Makefile defined SUBDIRS, run make in each -.PHONY: subdirs -subdirs: - @if test -n "$(SUBDIRS)" ; then \ - for dir in $(SUBDIRS) ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE)) || exit 1; \ - fi \ - done \ - fi - - -.PHONY: symlinks -symlinks: - - -depend: $(C_SOURCES) $(CXX_SOURCES) $(ASM_SOURCES) $(SYMLINKS) - @ echo "running $(MKDEP)" - @ rm -f depend - @ touch depend - @ $(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) \ - $(C_SOURCES) $(CXX_SOURCES) \ - $(ASM_SOURCES) > /dev/null 2>/dev/null - - -# Emacs tags -tags: - etags `find . -name \*.[ch]` `find ../include` - - -# Remove .o and backup files -clean: - -rm -f *.o */*.o *~ *.so *~ server/*.o $(SYMLINKS) - -rm -f depend depend.bak - - -install: $(LIBNAME) - $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR) - $(MINSTALL) -m 755 $(LIBNAME) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR) - - --include depend diff --git a/mesalib/src/mesa/drivers/dri/dri.pc.in b/mesalib/src/mesa/drivers/dri/dri.pc.in index 695aa6cfd..de6e08a4a 100644 --- a/mesalib/src/mesa/drivers/dri/dri.pc.in +++ b/mesalib/src/mesa/drivers/dri/dri.pc.in @@ -1,8 +1,8 @@ -prefix=@INSTALL_DIR@ -exec_prefix=${prefix} -libdir=@INSTALL_LIB_DIR@ -includedir=@INSTALL_INC_DIR@ -dridriverdir=@DRI_DRIVER_DIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +dridriverdir=@DRI_DRIVER_INSTALL_DIR@ Name: dri Description: Direct Rendering Infrastructure diff --git a/mesalib/src/mesa/drivers/dri/swrast/Makefile b/mesalib/src/mesa/drivers/dri/swrast/Makefile deleted file mode 100644 index 509fa28b6..000000000 --- a/mesalib/src/mesa/drivers/dri/swrast/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# src/mesa/drivers/dri/swrast/Makefile - -TOP = ../../../../.. -include $(TOP)/configs/current - -LIBNAME = swrast_dri.so - -include ../Makefile.defines - -DRIVER_DEFINES = -D__NOT_HAVE_DRM_H - -DRIVER_SOURCES = \ - swrast.c \ - swrast_span.c - -C_SOURCES = \ - $(SWRAST_COMMON_SOURCES) \ - $(DRIVER_SOURCES) - -ASM_SOURCES = - -SWRAST_COMMON_SOURCES = \ - ../common/utils.c \ - ../common/drisw_util.c - -include ../Makefile.targets - -- cgit v1.2.3