From ae352ccb901ebd520f9fd67e1a00b1ae400720d0 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 5 Sep 2012 20:34:53 -0700 Subject: [PATCH] Remove gallium targets' Makefile.{dri,vdpau,xorg,xvmc} --- src/gallium/targets/Makefile.dri | 110 ------------------------------------- src/gallium/targets/Makefile.vdpau | 71 ------------------------ src/gallium/targets/Makefile.xorg | 86 ----------------------------- src/gallium/targets/Makefile.xvmc | 71 ------------------------ 4 files changed, 338 deletions(-) delete mode 100644 src/gallium/targets/Makefile.dri delete mode 100644 src/gallium/targets/Makefile.vdpau delete mode 100644 src/gallium/targets/Makefile.xorg delete mode 100644 src/gallium/targets/Makefile.xvmc diff --git a/src/gallium/targets/Makefile.dri b/src/gallium/targets/Makefile.dri deleted file mode 100644 index 5b6676d..0000000 --- a/src/gallium/targets/Makefile.dri +++ /dev/null @@ -1,110 +0,0 @@ -# -*-makefile-*- - - -ifeq ($(MESA_LLVM),1) -LDFLAGS += $(LLVM_LDFLAGS) -DRIVER_EXTRAS = $(LLVM_LIBS) -endif - -MESA_MODULES = \ - $(TOP)/src/mesa/libmesagallium.a \ - $(GALLIUM_AUXILIARIES) - -COMMON_GALLIUM_SOURCES = \ - $(TOP)/src/mesa/drivers/dri/common/utils.c \ - $(TOP)/src/mesa/drivers/dri/common/dri_util.c \ - $(TOP)/src/mesa/drivers/dri/common/xmlconfig.c - -COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \ - $(TOP)/src/mesa/drivers/common/driverfuncs.c - -COMMON_BM_SOURCES = \ - $(TOP)/src/mesa/drivers/dri/common/dri_bufmgr.c \ - $(TOP)/src/mesa/drivers/dri/common/dri_drmpool.c - -INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES) - -OBJECTS = \ - $(C_SOURCES:.c=.o) \ - $(ASM_SOURCES:.S=.o) - - -### Include directories -SHARED_INCLUDES = \ - -I. \ - -I$(TOP)/src/mesa/drivers/dri/common \ - -Iserver \ - -I$(TOP)/include \ - -I$(TOP)/include/GL/internal \ - -I$(TOP)/src/mapi \ - -I$(TOP)/src/gallium/include \ - -I$(TOP)/src/gallium/auxiliary \ - -I$(TOP)/src/gallium/drivers \ - -I$(TOP)/src/gallium/winsys \ - -I$(TOP)/src/mesa \ - -I$(TOP)/src/mesa/main \ - -I$(TOP)/src/mesa/math \ - -I$(TOP)/src/mesa/transform \ - -I$(TOP)/src/mesa/shader \ - -I$(TOP)/src/mesa/swrast \ - -I$(TOP)/src/mesa/swrast_setup \ - -I$(TOP)/src/egl/main \ - -I$(TOP)/src/egl/drivers/dri \ - $(LIBDRM_CFLAGS) - -LIBNAME_STAGING = $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME) - - -##### RULES ##### - -.c.o: - $(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@ - -.S.o: - $(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@ - - -##### TARGETS ##### - -default: depend symlinks $(TOP)/$(LIB_DIR)/gallium $(LIBNAME) $(LIBNAME_STAGING) - -$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) Makefile \ - $(TOP)/src/mesa/drivers/dri/common/dri_test.o - $(MKLIB) -o $@.tmp -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \ - $(OBJECTS) $(PIPE_DRIVERS) \ - -Wl,--start-group $(MESA_MODULES) -Wl,--end-group \ - $(GALLIUM_DRI_LIB_DEPS) $(DRIVER_EXTRAS) - $(CXX) $(CFLAGS) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(GALLIUM_DRI_LIB_DEPS) $(LDFLAGS); - @rm -f $@.test - mv -f $@.tmp $@ - -$(TOP)/$(LIB_DIR)/gallium: - mkdir -p $@ - -$(LIBNAME_STAGING): $(LIBNAME) - $(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR)/gallium - -depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS) - rm -f depend - touch depend - $(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \ - $(ASM_SOURCES) 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/src/gallium/targets/Makefile.vdpau b/src/gallium/targets/Makefile.vdpau deleted file mode 100644 index dec64ca..0000000 --- a/src/gallium/targets/Makefile.vdpau +++ /dev/null @@ -1,71 +0,0 @@ -# This makefile template is used to build libvdpau_g3dvl.so - -LIBNAME = lib$(LIBBASENAME).so -VDPAU_LIB_GLOB=lib$(LIBBASENAME).*so* -VDPAU_MAJOR = 1 -VDPAU_MINOR = 0 -INCLUDES = -I$(TOP)/src/gallium/include \ - -I$(TOP)/src/gallium/drivers \ - -I$(TOP)/src/gallium/auxiliary \ - -I$(TOP)/src/gallium/winsys \ - $(DRIVER_INCLUDES) -DEFINES = -DGALLIUM_TRACE -DVER_MAJOR=$(VDPAU_MAJOR) -DVER_MINOR=$(VDPAU_MINOR) $(DRIVER_DEFINES) -LIBS = $(DRIVER_LIBS) -lvdpau -lX11-xcb -lxcb-dri2 -lm -lrt -STATE_TRACKER_LIB = $(TOP)/src/gallium/state_trackers/vdpau/libvdpautracker.a - -ifeq ($(MESA_LLVM),1) -LDFLAGS += $(LLVM_LDFLAGS) -DRIVER_EXTRAS = $(LLVM_LIBS) -LD=$(CXX) -else - ifeq ($(LINK_WITH_CXX),1) - LD=$(CXX) - else - LD=$(CC) - endif -endif - -OBJECTS = $(C_SOURCES:.c=.o) \ - $(ASM_SOURCES:.S=.o) - -##### RULES ##### - -.c.o: - $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ - -.S.o: - $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ - -##### TARGETS ##### - -default: depend symlinks $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME) - -$(TOP)/$(LIB_DIR)/gallium/$(LIBNAME): $(OBJECTS) $(PIPE_DRIVERS) $(STATE_TRACKER_LIB) Makefile - $(MKLIB) -o $(LIBBASENAME) -linker '$(LD)' -ldflags '$(LDFLAGS)' \ - -major $(VDPAU_MAJOR) -minor $(VDPAU_MINOR) $(MKLIB_OPTIONS) \ - -install $(TOP)/$(LIB_DIR)/gallium \ - $(OBJECTS) $(STATE_TRACKER_LIB) $(PIPE_DRIVERS) $(LIBS) $(DRIVER_EXTRAS) - -$(TOP)/$(LIB_DIR)/gallium: - mkdir -p $@ - -depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS) - rm -f depend - touch depend - $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDES) $(C_SOURCES) \ - $(ASM_SOURCES) 2> /dev/null - -# Emacs tags -tags: - etags `find . -name \*.[ch]` `find ../include` - -# Remove .o and backup files -clean: - -rm -f $(OBJECTS) *~ *.so $(SYMLINKS) - -rm -f depend depend.bak - -install: default - $(INSTALL) -d $(DESTDIR)$(VDPAU_LIB_INSTALL_DIR) - $(MINSTALL) -m 755 $(TOP)/$(LIB_DIR)/gallium/$(VDPAU_LIB_GLOB) $(DESTDIR)$(VDPAU_LIB_INSTALL_DIR) - -include depend diff --git a/src/gallium/targets/Makefile.xorg b/src/gallium/targets/Makefile.xorg deleted file mode 100644 index 21bf237..0000000 --- a/src/gallium/targets/Makefile.xorg +++ /dev/null @@ -1,86 +0,0 @@ -# src/gallium/targets/Makefile.xorg - -# Template makefile for gallium xorg drivers. -# -# Usage: -# The minimum that the including makefile needs to define -# is TOP, LIBNAME and one of of the *_SOURCES. -# -# Optional defines: -# DRIVER_INCLUDES are appended to the list of includes directories. -# DRIVER_DEFINES is not used for makedepend, but for compilation. -# DRIVER_PIPES are pipe drivers and modules that the driver depends on. -# DRIVER_LINKS are flags given to the linker. - -### Basic defines ### - -OBJECTS = $(C_SOURCES:.c=.o) \ - $(CPP_SOURCES:.cpp=.o) \ - $(ASM_SOURCES:.S=.o) - -INCLUDES = \ - $(shell $(PKG_CONFIG) --cflags-only-I pixman-1 xorg-server libdrm xproto) \ - -I$(TOP)/src/gallium/include \ - -I$(TOP)/src/gallium/drivers \ - -I$(TOP)/src/gallium/auxiliary \ - -I$(TOP)/src/gallium/winsys \ - $(DRIVER_INCLUDES) - -LIBNAME_STAGING = $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME) - -ifeq ($(MESA_LLVM),1) -LDFLAGS += $(LLVM_LDFLAGS) -DRIVER_LINKS += $(LLVM_LIBS) -lm -ldl -LD=$(CXX) -else - ifeq ($(LINK_WITH_CXX),1) - LD=$(CXX) - else - LD=$(CC) - endif -endif - - -##### TARGETS ##### - -default: depend $(TOP)/$(LIB_DIR)/gallium $(LIBNAME) $(LIBNAME_STAGING) - -$(LIBNAME): $(OBJECTS) Makefile ../Makefile.xorg $(LIBS) $(DRIVER_PIPES) $(GALLIUM_AUXILIARIES) - $(MKLIB) -linker '$(LD)' -noprefix -o $@ -ldflags '$(LDFLAGS)' $(OBJECTS) $(DRIVER_PIPES) $(GALLIUM_AUXILIARIES) $(DRIVER_LINKS) - -depend: $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) $(SYMLINKS) $(GENERATED_SOURCES) - rm -f depend - touch depend - $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) $(GENERATED_SOURCES) 2> /dev/null - -$(LIBNAME_STAGING): $(LIBNAME) - $(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR)/gallium - -$(TOP)/$(LIB_DIR)/gallium: - mkdir -p $@ - -clean: - rm -f $(OBJECTS) $(GENERATED_SOURCES) $(LIBNAME) depend depend.bak - -install: - $(INSTALL) -d $(DESTDIR)/$(XORG_DRIVER_INSTALL_DIR) - $(MINSTALL) -m 755 $(LIBNAME) $(DESTDIR)/$(XORG_DRIVER_INSTALL_DIR) - - -##### RULES ##### - -%.s: %.c - $(CC) -S $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@ - -%.o: %.c - $(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@ - -%.o: %.cpp - $(CXX) -c $(INCLUDES) $(CXXFLAGS) $(DRIVER_DEFINES) $< -o $@ - -%.o: %.S - $(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@ - -sinclude depend - -.PHONY: default clean install diff --git a/src/gallium/targets/Makefile.xvmc b/src/gallium/targets/Makefile.xvmc deleted file mode 100644 index 8ae7e9a..0000000 --- a/src/gallium/targets/Makefile.xvmc +++ /dev/null @@ -1,71 +0,0 @@ -# This makefile template is used to build libXvMC*.so - -LIBNAME = lib$(LIBBASENAME).so -XVMC_LIB_GLOB=lib$(LIBBASENAME).*so* -XVMC_MAJOR = 1 -XVMC_MINOR = 0 -INCLUDES = -I$(TOP)/src/gallium/include \ - -I$(TOP)/src/gallium/drivers \ - -I$(TOP)/src/gallium/auxiliary \ - -I$(TOP)/src/gallium/winsys \ - $(DRIVER_INCLUDES) -DEFINES = -DGALLIUM_TRACE $(DRIVER_DEFINES) -LIBS = $(DRIVER_LIBS) -lXv -lX11-xcb -lxcb-dri2 -lm -STATE_TRACKER_LIB = $(TOP)/src/gallium/state_trackers/xvmc/libxvmctracker.a - -ifeq ($(MESA_LLVM),1) -LDFLAGS += $(LLVM_LDFLAGS) -DRIVER_EXTRAS = $(LLVM_LIBS) -LD=$(CXX) -else - ifeq ($(LINK_WITH_CXX),1) - LD=$(CXX) - else - LD=$(CC) - endif -endif - -OBJECTS = $(C_SOURCES:.c=.o) \ - $(ASM_SOURCES:.S=.o) - -##### RULES ##### - -.c.o: - $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ - -.S.o: - $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ - -##### TARGETS ##### - -default: depend symlinks $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME) - -$(TOP)/$(LIB_DIR)/gallium/$(LIBNAME): $(OBJECTS) $(PIPE_DRIVERS) $(STATE_TRACKER_LIB) Makefile - $(MKLIB) -o $(LIBBASENAME) -linker '$(LD)' -ldflags '$(LDFLAGS)' \ - -major $(XVMC_MAJOR) -minor $(XVMC_MINOR) $(MKLIB_OPTIONS) \ - -install $(TOP)/$(LIB_DIR)/gallium \ - $(OBJECTS) $(STATE_TRACKER_LIB) $(PIPE_DRIVERS) $(LIBS) $(DRIVER_EXTRAS) - -$(TOP)/$(LIB_DIR)/gallium: - mkdir -p $@ - -depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS) - rm -f depend - touch depend - $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDES) $(C_SOURCES) \ - $(ASM_SOURCES) 2> /dev/null - -# Emacs tags -tags: - etags `find . -name \*.[ch]` `find ../include` - -# Remove .o and backup files -clean: - -rm -f $(OBJECTS) *~ *.so $(SYMLINKS) - -rm -f depend depend.bak - -install: default - $(INSTALL) -d $(DESTDIR)$(XVMC_LIB_INSTALL_DIR) - $(MINSTALL) -m 755 $(TOP)/$(LIB_DIR)/gallium/$(XVMC_LIB_GLOB) $(DESTDIR)$(XVMC_LIB_INSTALL_DIR) - -include depend -- 2.7.4