From a2a6799fbefc6900f2371efab778c5bc2bf5a6e9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Christian=20K=C3=B6nig?= <deathsimple@vodafone.de>
Date: Wed, 13 Jul 2011 19:37:28 +0200
Subject: [PATCH] [g3dvl] remove some unneeded Makefiles

---
 src/gallium/winsys/g3dvl/drm/Makefile         | 12 ----
 .../winsys/g3dvl/drm/Makefile.template        | 66 -------------------
 src/gallium/winsys/g3dvl/drm/nouveau/Makefile | 23 -------
 src/gallium/winsys/g3dvl/drm/radeon/Makefile  | 20 ------
 4 files changed, 121 deletions(-)
 delete mode 100644 src/gallium/winsys/g3dvl/drm/Makefile
 delete mode 100644 src/gallium/winsys/g3dvl/drm/Makefile.template
 delete mode 100644 src/gallium/winsys/g3dvl/drm/nouveau/Makefile
 delete mode 100644 src/gallium/winsys/g3dvl/drm/radeon/Makefile

diff --git a/src/gallium/winsys/g3dvl/drm/Makefile b/src/gallium/winsys/g3dvl/drm/Makefile
deleted file mode 100644
index 0711f44d8e3..00000000000
--- a/src/gallium/winsys/g3dvl/drm/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# src/gallium/winsys/Makefile
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-SUBDIRS = $(GALLIUM_WINSYS_DRM_DIRS)
-
-default install clean:
-	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE) $@) || exit 1; \
-		fi \
-	done
diff --git a/src/gallium/winsys/g3dvl/drm/Makefile.template b/src/gallium/winsys/g3dvl/drm/Makefile.template
deleted file mode 100644
index 2b79deef4bc..00000000000
--- a/src/gallium/winsys/g3dvl/drm/Makefile.template
+++ /dev/null
@@ -1,66 +0,0 @@
-XVMC_MAJOR = 1
-XVMC_MINOR = 0
-XVMC_LIB = XvMCg3dvl
-XVMC_LIB_NAME = lib$(XVMC_LIB).so
-XVMC_LIB_DEPS = $(EXTRA_LIB_PATH) -lXvMC -lXv -lX11 -lm
-
-###############################################################
-
-INCLUDES = $(DRIVER_INCLUDES) \
-           -I$(TOP)/src/gallium/include \
-           -I$(TOP)/src/gallium/auxiliary \
-           -I$(TOP)/src/gallium/drivers \
-           -I$(TOP)/src/gallium/winsys/g3dvl \
-           -I$(TOP)/src/gallium/winsys/g3dvl/dri
-
-DEFINES += $(DRIVER_DEFINES) \
-           -DGALLIUM_SOFTPIPE \
-           -DGALLIUM_TRACE
-
-# XXX: Hack, if we include libxvmctracker.a in LIBS none of the symbols are
-# pulled in by the linker because xsp_winsys.c doesn't refer to them
-OBJECTS = $(C_SOURCES:.c=.o) $(TOP)/src/gallium/state_trackers/xorg/xvmc/*.o
-
-LIBS = $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \
-       $(PIPE_DRIVERS) \
-       $(TOP)/src/gallium/auxiliary/libgallium.a
-
-.c.o:
-	$(CC) -c $(INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@
-
-.S.o:
-	$(CC) -c $(INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@
-
-.PHONY: default $(TOP)/$(LIB_DIR)/gallium clean
-
-default: depend $(TOP)/$(LIB_DIR)/gallium $(TOP)/$(LIB_DIR)/gallium/$(XVMC_LIB_NAME)
-
-$(TOP)/$(LIB_DIR)/gallium:
-	@mkdir -p $(TOP)/$(LIB_DIR)/gallium
-
-# Make the libXvMCg3dvl.so library
-$(TOP)/$(LIB_DIR)/gallium/$(XVMC_LIB_NAME): $(OBJECTS) $(LIBS) Makefile
-	$(MKLIB) -o $(XVMC_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-		-major $(XVMC_MAJOR) -minor $(XVMC_MINOR) $(MKLIB_OPTIONS) \
-		-install $(TOP)/$(LIB_DIR)/gallium -id $(INSTALL_LIB_DIR)/lib$(XVMC_LIB).1.dylib \
-		$(XVMC_LIB_DEPS) $(DRIVER_LIB_DEPS) $(OBJECTS) $(LIBS)
-
-depend: $(SOURCES) Makefile
-	$(RM) depend
-	touch depend
-	$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDES) $(SOURCES)
-
-#install: default
-#	$(INSTALL) -d $(INSTALL_DIR)/include/GL
-#	$(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
-#	$(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL
-#	@if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \
-#		$(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(INSTALL_DIR)/$(LIB_DIR); \
-#	fi
-
-clean: Makefile
-	$(RM) $(TOP)/$(LIB_DIR)/gallium/$(XVMC_LIB_NAME)
-	$(RM) *.o *~
-	$(RM) depend depend.bak
-
--include depend
diff --git a/src/gallium/winsys/g3dvl/drm/nouveau/Makefile b/src/gallium/winsys/g3dvl/drm/nouveau/Makefile
deleted file mode 100644
index 5c55186f672..00000000000
--- a/src/gallium/winsys/g3dvl/drm/nouveau/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# This makefile produces a libXvMCg3dvl.so which is
-# based on DRM/DRI
-
-TOP = ../../../../../..
-include $(TOP)/configs/current
-
-C_SOURCES =
-
-DRIVER_INCLUDES = $(shell pkg-config libdrm libdrm_nouveau --cflags-only-I) \
-                   -I$(TOP)/src/gallium/winsys/drm/nouveau
-DRIVER_DEFINES = $(shell pkg-config libdrm libdrm_nouveau --cflags-only-other)
-
-PIPE_DRIVERS = \
-	$(TOP)/src/gallium/winsys/drm/nouveau/drm/libnouveaudrm.a \
-	$(TOP)/src/gallium/drivers/nv30/libnv30.a \
-	$(TOP)/src/gallium/drivers/nv40/libnv40.a \
-	$(TOP)/src/gallium/drivers/nv50/libnv50.a \
-	$(TOP)/src/gallium/drivers/nouveau/libnouveau.a \
-        $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a
-
-DRIVER_LIB_DEPS += $(shell pkg-config libdrm_nouveau --libs)
-
-include ../Makefile.template
diff --git a/src/gallium/winsys/g3dvl/drm/radeon/Makefile b/src/gallium/winsys/g3dvl/drm/radeon/Makefile
deleted file mode 100644
index 0f7fd1c15ad..00000000000
--- a/src/gallium/winsys/g3dvl/drm/radeon/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# This makefile produces a libXvMCg3dvl.so which is
-# based on DRM/DRI
-
-TOP = ../../../../../..
-include $(TOP)/configs/current
-
-C_SOURCES =
-
-DRIVER_INCLUDES = $(shell pkg-config libdrm libdrm_radeon --cflags-only-I) \
-                   -I$(TOP)/src/gallium/winsys/drm/radeon \
-DRIVER_DEFINES = $(shell pkg-config libdrm libdrm_radeon --cflags-only-other)
-
-PIPE_DRIVERS = \
-	$(TOP)/src/gallium/winsys/drm/radeon/core/libradeonwinsys.a \
-	$(TOP)/src/gallium/drivers/r300/libr300.a \
-        $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a
-
-DRIVER_LIB_DEPS += $(shell pkg-config libdrm_radeon --libs)
-
-include ../Makefile.template
-- 
2.30.2