5 files changed, 74 insertions, 32 deletions
diff --git a/configure.ac b/configure.ac
index ffe6351fa39..7141dad6278 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2072,6 +2072,7 @@ AC_CONFIG_FILES([configs/current
 		src/gallium/targets/vdpau-radeonsi/Makefile
 		src/gallium/targets/vdpau-softpipe/Makefile
 		src/gallium/targets/xorg-i915/Makefile
+		src/gallium/targets/xorg-nouveau/Makefile
 		src/gallium/winsys/Makefile
 		src/gallium/winsys/i915/drm/Makefile
 		src/gallium/winsys/i915/sw/Makefile
diff --git a/src/gallium/targets/xorg-nouveau/.gitignore b/src/gallium/targets/xorg-nouveau/.gitignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/src/gallium/targets/xorg-nouveau/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/targets/xorg-nouveau/Makefile b/src/gallium/targets/xorg-nouveau/Makefile
deleted file mode 100644
index 8e704c6a5fe..00000000000
--- a/src/gallium/targets/xorg-nouveau/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = nouveau2_drv.so
-
-C_SOURCES = \
-	nouveau_target.c \
-	nouveau_xorg.c
-
-DRIVER_DEFINES = \
-	-DHAVE_CONFIG_H -DGALLIUM_RBUG -DGALLIUM_TRACE
-
-DRIVER_PIPES = \
-	$(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
-	$(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \
-	$(TOP)/src/gallium/drivers/nv30/libnv30.a \
-	$(TOP)/src/gallium/drivers/nv50/libnv50.a \
-	$(TOP)/src/gallium/drivers/nvc0/libnvc0.a \
-	$(TOP)/src/gallium/drivers/nouveau/libnouveau.a \
-	$(TOP)/src/gallium/drivers/trace/libtrace.a \
-	$(TOP)/src/gallium/drivers/rbug/librbug.a
-
-DRIVER_LINKS = \
-	$(shell $(PKG_CONFIG) --libs libdrm libdrm_nouveau)
-
-DRIVER_INCLUDES = \
-	$(shell $(PKG_CONFIG) --cflags-only-I libdrm libdrm_nouveau xf86driproto)
-
-LINK_WITH_CXX=1
-
-include ../Makefile.xorg
diff --git a/src/gallium/targets/xorg-nouveau/Makefile.am b/src/gallium/targets/xorg-nouveau/Makefile.am
new file mode 100644
index 00000000000..70c0bd6db87
--- /dev/null
+++ b/src/gallium/targets/xorg-nouveau/Makefile.am
@@ -0,0 +1,71 @@
+# Copyright © 2012 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CFLAGS = \
+	$(GALLIUM_CFLAGS) \
+	$(PTHREAD_CFLAGS) \
+	$(XORG_CFLAGS)
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/gallium/drivers \
+	-I$(top_srcdir)/src/gallium/winsys \
+	-DHAVE_CONFIG_H \
+	-DGALLIUM_RBUG \
+	-DGALLIUM_TRACE
+
+xorgdir = $(XORG_DRIVER_INSTALL_DIR)
+xorg_LTLIBRARIES = nouveau2_drv.la
+
+nodist_EXTRA_nouveau2_drv_la_SOURCES = dummy.cpp
+nouveau2_drv_la_SOURCES = \
+	nouveau_target.c \
+	nouveau_xorg.c
+
+nouveau2_drv_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+
+nouveau2_drv_la_LIBADD = \
+	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+	$(top_builddir)/src/gallium/state_trackers/xorg/libxorgtracker.la \
+	$(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
+	$(top_builddir)/src/gallium/drivers/nv30/libnv30.la \
+	$(top_builddir)/src/gallium/drivers/nv50/libnv50.la \
+	$(top_builddir)/src/gallium/drivers/nvc0/libnvc0.la \
+	$(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \
+	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
+	$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
+	$(GALLIUM_DRI_LIB_DEPS) \
+	$(LIBDRM_XORG_LIBS) \
+	$(LIBKMS_XORG_LIBS) \
+	$(NOUVEAU_LIBS)
+
+if HAVE_MESA_LLVM
+AM_CFLAGS += $(LLVM_CFLAGS)
+nouveau2_drv_la_LDFLAGS += $(LLVM_LDFLAGS)
+nouveau2_drv_la_LIBADD += $(LLVM_LIBS)
+endif
+
+# Provide compatibility with scripts for the old Mesa build system for
+# a while by putting a link to the driver into /lib of the build tree.
+all-local: nouveau2_drv.la
+	$(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
+	ln -f .libs/nouveau2_drv.so $(top_builddir)/$(LIB_DIR)/gallium/nouveau2_drv.so
diff --git a/src/gallium/targets/xorg-nouveau/nouveau_xorg.c b/src/gallium/targets/xorg-nouveau/nouveau_xorg.c
index d0c1b834f64..2324d24445a 100644
--- a/src/gallium/targets/xorg-nouveau/nouveau_xorg.c
+++ b/src/gallium/targets/xorg-nouveau/nouveau_xorg.c
@@ -30,7 +30,7 @@
 
 #include "../../state_trackers/xorg/xorg_winsys.h"
 #include <nouveau.h>
-#include <xorg/dri.h>
+#include <dri.h>
 #include <xf86drmMode.h>
 
 static void nouveau_xorg_identify(int flags);