From: Jakob Bornecrantz <jakob@vmware.com>
Date: Sun, 6 Jun 2010 11:18:40 +0000 (+0100)
Subject: nouveau: Use Xorg template makefile
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=def70b17d488bf78cef840c9928aa9e91916d32d;p=mesa.git

nouveau: Use Xorg template makefile
---

diff --git a/src/gallium/targets/xorg-nouveau/Makefile b/src/gallium/targets/xorg-nouveau/Makefile
index b514b570007..f50872362f6 100644
--- a/src/gallium/targets/xorg-nouveau/Makefile
+++ b/src/gallium/targets/xorg-nouveau/Makefile
@@ -1,56 +1,21 @@
 TOP = ../../../..
 include $(TOP)/configs/current
 
-TARGET     = modesetting_drv.so
-CFILES     = $(wildcard ./*.c)
-OBJECTS    = $(patsubst ./%.c,./%.o,$(CFILES))
+LIBNAME = modesetting_drv.so
 
-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/mesa \
-	-I$(TOP)/include \
-	-I$(TOP)/src/egl/main
+C_SOURCES = \
+	nouveau_xorg.c
 
-LIBS = \
+DRIVER_DEFINES = \
+	-DHAVE_CONFIG_H
+
+DRIVER_LINKS = \
 	$(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
 	$(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \
 	$(TOP)/src/gallium/drivers/nvfx/libnvfx.a \
 	$(TOP)/src/gallium/drivers/nv50/libnv50.a \
 	$(TOP)/src/gallium/drivers/nouveau/libnouveau.a \
-	$(GALLIUM_AUXILIARIES)
-
-DRIVER_DEFINES = \
-	-DHAVE_CONFIG_H
-
-
-#############################################
-
-
-
-all default: $(TARGET)
-
-$(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_nouveau
-
-clean:
-	rm -rf $(OBJECTS) $(TARGET)
-
-install:
-	$(INSTALL) -d $(DESTDIR)/$(XORG_DRIVER_INSTALL_DIR)
-	$(MINSTALL) -m 755 $(TARGET) $(DESTDIR)/$(XORG_DRIVER_INSTALL_DIR)
-
-
-##############################################
-
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCLUDES) $(DRIVER_DEFINES) $< -o $@
-
-
-##############################################
+	$(GALLIUM_AUXILIARIES) \
+	$(shell pkg-config --libs libdrm libdrm_nouveau)
 
-.PHONY	= all clean install
+include ../Makefile.xorg