1 files changed, 10 insertions, 52 deletions
diff --git a/src/gallium/targets/xorg-vmwgfx/Makefile b/src/gallium/targets/xorg-vmwgfx/Makefile
index 01a10b6f198..c0ff9991165 100644
--- a/src/gallium/targets/xorg-vmwgfx/Makefile
+++ b/src/gallium/targets/xorg-vmwgfx/Makefile
@@ -1,72 +1,30 @@
 TOP = ../../../..
 include $(TOP)/configs/current
 
-TARGET = vmwgfx_drv.so
+LIBNAME = vmwgfx_drv.so
 
-CFILES = \
+C_SOURCES = \
 	vmw_xorg.c \
 	vmw_video.c \
 	vmw_ioctl.c \
 	vmw_ctrl.c \
 	vmw_screen.c
 
-OBJECTS = $(patsubst %.c,%.o,$(CFILES))
-
-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 \
+DRIVER_INCLUDES = \
 	-I$(TOP)/src/gallium
 
-LIBS = \
+DRIVER_DEFINES = \
+	-std=gnu99 \
+	-DHAVE_CONFIG_H
+
+DRIVER_LINKS = \
 	$(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
 	$(TOP)/src/gallium/winsys/svga/drm/libsvgadrm.a \
 	$(TOP)/src/gallium/drivers/trace/libtrace.a \
 	$(TOP)/src/gallium/drivers/rbug/librbug.a \
 	$(TOP)/src/gallium/drivers/svga/libsvga.a \
-	$(GALLIUM_AUXILIARIES)
-
-LINKS = \
+	$(GALLIUM_AUXILIARIES) \
 	$(shell pkg-config --libs --silence-errors libkms) \
 	$(shell pkg-config --libs libdrm)
 
-DRIVER_DEFINES = \
-	-std=gnu99 \
-	-DHAVE_CONFIG_H
-
-TARGET_STAGING = $(TOP)/$(LIB_DIR)/gallium/$(TARGET)
-
-#############################################
-
-
-
-all default: $(TARGET) $(TARGET_STAGING)
-
-$(TARGET): $(OBJECTS) Makefile $(LIBS)
-	$(MKLIB) -noprefix -o $@ $(OBJECTS) $(LIBS) $(LINKS)
-
-$(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)
-
-
-##############################################
-
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCLUDES) $(DRIVER_DEFINES) $< -o $@
-
-
-##############################################
-
-.PHONY	= all clean install
+include ../Makefile.xorg