st/dri: merge dri/drm and dri/sw backends

[mesa.git] / src / gallium / targets / dri / Makefile.am

diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index e4d9a7e9794cc55c13eb13ad099a0ed8c535f183..4da3e71d6af3401c2ca1bfb4f6139f1ba44a1b5d 100644 (file)
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -1,9 +1,14 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
+       -I$(top_srcdir)/src/mapi \
+       -I$(top_srcdir)/src/mesa \
+       -I$(top_srcdir)/src/mesa/drivers/dri/common \
+       -I$(top_srcdir)/src/gallium/state_trackers/dri \
        $(GALLIUM_TARGET_CFLAGS)
 
 AM_CPPFLAGS = \
+       -DDRI_TARGET \
        -DGALLIUM_GALAHAD \
        -DGALLIUM_NOOP \
        -DGALLIUM_RBUG \
@@ -28,11 +33,11 @@ gallium_dri_la_LDFLAGS += \
        -Wl,--version-script=$(top_srcdir)/src/gallium/targets/dri/dri.sym
 endif # HAVE_LD_VERSION_SCRIPT
 
-# XXX: Fold libdridrm/libdrisw as drivers become megadriver (__dri*DriverExtension) aware
 gallium_dri_la_LIBADD = \
        $(top_builddir)/src/mesa/libmesagallium.la \
        $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
-       $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm_s.la \
+       $(top_builddir)/src/mesa/drivers/dri/common/libmegadriver_stub.la \
+       $(top_builddir)/src/gallium/state_trackers/dri/libdri.la \
        $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
        $(top_builddir)/src/gallium/drivers/noop/libnoop.la \
@@ -45,11 +50,35 @@ gallium_dri_la_LIBADD = \
 
 if HAVE_GALLIUM_STATIC_TARGETS
 
+# XXX: Temporary allow duplicated symbols, as the loader pulls in xmlconfig.c
+# which already provides driParse* and driQuery* amongst others.
+# Remove this hack as we come up with a cleaner solution.
+gallium_dri_la_LDFLAGS += \
+       -Wl,--allow-multiple-definition
+
 MEGADRIVERS =
 STATIC_TARGET_CPPFLAGS =
 STATIC_TARGET_LIB_DEPS = \
        $(top_builddir)/src/loader/libloader.la
 
+if HAVE_GALLIUM_I915
+MEGADRIVERS += i915
+STATIC_TARGET_CPPFLAGS += -DGALLIUM_I915
+STATIC_TARGET_LIB_DEPS += \
+       $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
+       $(top_builddir)/src/gallium/drivers/i915/libi915.la \
+       $(INTEL_LIBS)
+endif
+
+if HAVE_GALLIUM_ILO
+MEGADRIVERS += ilo
+STATIC_TARGET_CPPFLAGS += -DGALLIUM_ILO
+STATIC_TARGET_LIB_DEPS += \
+       $(top_builddir)/src/gallium/winsys/intel/drm/libintelwinsys.la \
+       $(top_builddir)/src/gallium/drivers/ilo/libilo.la \
+       $(INTEL_LIBS)
+endif
+
 if HAVE_GALLIUM_NOUVEAU
 MEGADRIVERS += nouveau
 STATIC_TARGET_CPPFLAGS += -DGALLIUM_NOUVEAU
@@ -93,6 +122,14 @@ STATIC_TARGET_LIB_DEPS += \
        $(RADEON_LIBS)
 endif
 
+if HAVE_GALLIUM_SVGA
+MEGADRIVERS += vmwgfx
+STATIC_TARGET_CPPFLAGS += -DGALLIUM_VMWGFX
+STATIC_TARGET_LIB_DEPS += \
+       $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \
+       $(top_builddir)/src/gallium/drivers/svga/libsvga.la
+endif
+
 if HAVE_GALLIUM_FREEDRENO
 MEGADRIVERS += freedreno
 STATIC_TARGET_CPPFLAGS += -DGALLIUM_FREEDRENO