Mesa (master): r300g: Use Xorg template makefile

Jakob Bornecrantz wallbraker at kemper.freedesktop.org
Mon Jun 7 10:24:17 PDT 2010


Module: Mesa
Branch: master
Commit: 77bfdb3530b1fd4e3ff192192c29adff4c1c003d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=77bfdb3530b1fd4e3ff192192c29adff4c1c003d

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Sun Jun  6 11:50:12 2010 +0100

r300g: Use Xorg template makefile

---

 src/gallium/targets/xorg-radeon/Makefile |   57 ++++++++----------------------
 1 files changed, 15 insertions(+), 42 deletions(-)

diff --git a/src/gallium/targets/xorg-radeon/Makefile b/src/gallium/targets/xorg-radeon/Makefile
index 85aa711..a4951c4 100644
--- a/src/gallium/targets/xorg-radeon/Makefile
+++ b/src/gallium/targets/xorg-radeon/Makefile
@@ -1,49 +1,22 @@
 TOP = ../../../..
 include $(TOP)/configs/current
 
-TARGET     = radeong_drv.so
-CFILES     = $(wildcard ./*.c)
-OBJECTS    = $(patsubst ./%.c,./%.o,$(CFILES))
+LIBNAME = radeon_drv.so
 
-CFLAGS = -DHAVE_CONFIG_H \
-         -g -Wall -Wimplicit-function-declaration -fPIC \
-         $(shell pkg-config --cflags pixman-1 xorg-server libdrm xproto) \
-         -I$(TOP)/src/gallium/include \
-         -I$(TOP)/src/gallium/drivers \
-         -I$(TOP)/src/gallium/auxiliary \
-         -I${TOP}/src/mesa \
-         -I$(TOP)/include \
-         -I$(TOP)/src/egl/main
+C_SOURCES = \
+	radeon_xorg.c
 
-LIBS = \
-	$(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
-	$(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
-	$(TOP)/src/gallium/drivers/r300/libr300.a \
-	$(TOP)/src/gallium/drivers/trace/libtrace.a \
-	$(TOP)/src/gallium/drivers/rbug/librbug.a \
-	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
-	$(GALLIUM_AUXILIARIES)
+DRIVER_DEFINES = \
+	-DHAVE_CONFIG_H
 
-TARGET_STAGING = $(TOP)/$(LIB_DIR)/gallium/$(TARGET)
-#############################################
+DRIVER_LINKS = \
+        $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
+        $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
+        $(TOP)/src/gallium/drivers/r300/libr300.a \
+        $(TOP)/src/gallium/drivers/trace/libtrace.a \
+        $(TOP)/src/gallium/drivers/rbug/librbug.a \
+        $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
+        $(GALLIUM_AUXILIARIES) \
+	$(shell pkg-config --libs libdrm libdrm_intel)
 
-all default: $(TARGET) $(TARGET_STAGING)
-
-$(TARGET): $(OBJECTS) Makefile $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a $(LIBS)
-	$(TOP)/bin/mklib -noprefix -o $@ \
-	$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_radeon
-
-$(TOP)/$(LIB_DIR)/gallium:
-	mkdir -p $@
-
-$(TARGET_STAGING): $(TARGET) $(TOP)/$(LIB_DIR)/gallium
-	$(INSTALL) $(TARGET) $(TOP)/$(LIB_DIR)/gallium
-
-clean:
-	rm -rf $(OBJECTS) $(TARGET)
-
-install:
-	$(INSTALL) -d $(DESTDIR)/$(XORG_DRIVER_INSTALL_DIR)
-	$(MINSTALL) -m 755 $(TARGET) $(DESTDIR)/$(XORG_DRIVER_INSTALL_DIR)
-
-.PHONY	= all clean install
+include ../Makefile.xorg



More information about the mesa-commit mailing list