targets/xorg-i915: Convert to automake

v2: Andreas Boll <andreas.boll.dev@gmail.com>
    - Provide compatibility with scripts for the old Mesa build system

4 files changed, 56 insertions, 24 deletions

diff --git a/configure.ac b/configure.ac
index 4b37c87cfe..1308074e9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2038,6 +2038,7 @@ AC_CONFIG_FILES([configs/current
 		src/gallium/targets/vdpau-r600/Makefile
 		src/gallium/targets/vdpau-radeonsi/Makefile
 		src/gallium/targets/vdpau-softpipe/Makefile
+		src/gallium/targets/xorg-i915/Makefile
 		src/gallium/winsys/Makefile
 		src/gallium/winsys/i915/drm/Makefile
 		src/gallium/winsys/i915/sw/Makefile
diff --git a/src/gallium/targets/xorg-i915/.gitignore b/src/gallium/targets/xorg-i915/.gitignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/src/gallium/targets/xorg-i915/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/targets/xorg-i915/Makefile b/src/gallium/targets/xorg-i915/Makefile
deleted file mode 100644
index 27ce100ac3..0000000000
--- a/src/gallium/targets/xorg-i915/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = i915_drv.so
-
-C_SOURCES = \
-	intel_target.c \
-	intel_xorg.c
-
-DRIVER_DEFINES = \
-	-DHAVE_CONFIG_H -DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_GALAHAD
-
-DRIVER_PIPES = \
-	$(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
-	$(TOP)/src/gallium/winsys/i915/drm/libi915drm.a \
-	$(TOP)/src/gallium/drivers/i915/libi915.a \
-	$(TOP)/src/gallium/drivers/galahad/libgalahad.a \
-	$(TOP)/src/gallium/drivers/trace/libtrace.a \
-	$(TOP)/src/gallium/drivers/rbug/librbug.a
-
-DRIVER_LINKS = \
-	$(shell $(PKG_CONFIG) --libs libdrm libdrm_intel)
-
-include ../Makefile.xorg
diff --git a/src/gallium/targets/xorg-i915/Makefile.am b/src/gallium/targets/xorg-i915/Makefile.am
new file mode 100644
index 0000000000..4585e58b53
--- /dev/null
+++ b/src/gallium/targets/xorg-i915/Makefile.am
@@ -0,0 +1,54 @@
+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 \
+	-DGALLIUM_GALAHAD
+
+xorgdir = $(XORG_DRIVER_INSTALL_DIR)
+xorg_LTLIBRARIES = i915_drv.la
+
+i915_drv_la_SOURCES = \
+	intel_target.c \
+	intel_xorg.c
+
+i915_drv_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+
+i915_drv_la_LIBADD = \
+	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+	$(top_builddir)/src/gallium/state_trackers/xorg/libxorgtracker.la \
+	$(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
+	$(top_builddir)/src/gallium/drivers/i915/libi915.la \
+	$(top_builddir)/src/gallium/drivers/galahad/libgalahad.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) \
+	$(INTEL_LIBS)
+
+if HAVE_MESA_LLVM
+i915_drv_la_LINK = $(CXXLINK) $(i915_drv_la_LDFLAGS)
+# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable
+nodist_EXTRA_i915_drv_la_SOURCES = dummy-cpp.cpp
+
+AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
+i915_drv_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
+else
+i915_drv_la_LINK = $(LINK) $(i915_drv_la_LDFLAGS)
+# Mention a dummy pure C file to trigger generation of the $(LINK) variable
+nodist_EXTRA_i915_drv_la_SOURCES = dummy-c.c
+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: i915_drv.la
+	$(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
+	ln -f .libs/i915_drv.so $(top_builddir)/$(LIB_DIR)/gallium/i915_drv.so