targets: drop the old MEGADRIVERS & STATIC_TARGET... variables

[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 a57ef01e68c1bc825067cd8baeb0d94da2b1629e..1094ffd496085ccc18b06f31f94c2a7899f8c2d6 100644 (file)
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -1,9 +1,15 @@
 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 = \
+       $(DEFINES) \
+       -DDRI_TARGET \
        -DGALLIUM_GALAHAD \
        -DGALLIUM_NOOP \
        -DGALLIUM_RBUG \
@@ -20,7 +26,6 @@ gallium_dri_la_LDFLAGS = \
        -shrext .so \
        -module \
        -avoid-version \
-       -Wl,--dynamic-list=$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn \
        $(GC_SECTIONS)
 
 if HAVE_LD_VERSION_SCRIPT
@@ -28,11 +33,16 @@ 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
+if HAVE_LD_DYNAMIC_LIST
+gallium_dri_la_LDFLAGS += \
+       -Wl,--dynamic-list=$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn
+endif # HAVE_LD_DYNAMIC_LIST
+
 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 \
@@ -43,58 +53,41 @@ gallium_dri_la_LIBADD = \
        $(LIBDRM_LIBS) \
        $(GALLIUM_COMMON_LIB_DEPS)
 
-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_NOUVEAU
-MEGADRIVERS += nouveau
-STATIC_TARGET_CPPFLAGS += -DGALLIUM_NOUVEAU
-STATIC_TARGET_LIB_DEPS += \
-       $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
-       $(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \
-       $(NOUVEAU_LIBS)
-endif
+TARGET_DRIVERS =
+TARGET_CPPFLAGS =
+TARGET_LIB_DEPS = $(top_builddir)/src/loader/libloader.la
 
-if NEED_RADEON_DRM_WINSYS
-STATIC_TARGET_LIB_DEPS += \
-       $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la
-endif
+include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc
 
-if HAVE_GALLIUM_RADEON_COMMON
-STATIC_TARGET_LIB_DEPS += \
-       $(top_builddir)/src/gallium/drivers/radeon/libradeon.la
-endif
+include $(top_srcdir)/src/gallium/drivers/ilo/Automake.inc
 
-if HAVE_GALLIUM_R300
-MEGADRIVERS += r300
-STATIC_TARGET_CPPFLAGS += -DGALLIUM_R300
-STATIC_TARGET_LIB_DEPS += \
-       $(top_builddir)/src/gallium/drivers/r300/libr300.la \
-       $(RADEON_LIBS)
-endif
+include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc
 
-if HAVE_GALLIUM_R600
-MEGADRIVERS += r600
-STATIC_TARGET_CPPFLAGS += -DGALLIUM_R600
-STATIC_TARGET_LIB_DEPS += \
-       $(top_builddir)/src/gallium/drivers/r600/libr600.la \
-       $(RADEON_LIBS)
-endif
+include $(top_srcdir)/src/gallium/drivers/r300/Automake.inc
+include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc
+include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc
+
+include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc
+
+include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
+
+include $(top_srcdir)/src/gallium/drivers/vc4/Automake.inc
+
+include $(top_srcdir)/src/gallium/drivers/softpipe/Automake.inc
+include $(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc
+
+if HAVE_GALLIUM_STATIC_TARGETS
 
-if HAVE_GALLIUM_RADEONSI
-MEGADRIVERS += radeonsi
-STATIC_TARGET_CPPFLAGS += -DGALLIUM_RADEONSI
-STATIC_TARGET_LIB_DEPS += \
-       $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
-       $(RADEON_LIBS)
-endif
 gallium_dri_la_SOURCES += target.c
-AM_CPPFLAGS += $(STATIC_TARGET_CPPFLAGS)
-gallium_dri_la_LIBADD += $(STATIC_TARGET_LIB_DEPS)
+gallium_dri_la_CPPFLAGS = $(AM_CPPFLAGS) $(TARGET_CPPFLAGS)
+gallium_dri_la_LIBADD += $(TARGET_LIB_DEPS) \
+       $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
 
 else # HAVE_GALLIUM_STATIC_TARGETS
 
@@ -115,7 +108,7 @@ if HAVE_COMPAT_SYMLINKS
 all-local: $(dri_LTLIBRARIES)
        $(AM_V_GEN)link_dir=$(top_builddir)/$(LIB_DIR)/gallium;         \
        $(MKDIR_P) $${link_dir};                                        \
-       for i in $(MEGADRIVERS); do                                     \
+       for i in $(TARGET_DRIVERS); do                                  \
                j=gallium_dri.so;                                       \
                k=$${i}_dri.so;                                         \
                ln -f .libs/$${j}                                       \
@@ -127,7 +120,7 @@ endif
 # gallium_dri.so in the set of final installed files.
 install-data-hook:
        $(AM_V_GEN)dest_dir=$(DESTDIR)/$(dridir);                       \
-       for i in $(MEGADRIVERS); do                                     \
+       for i in $(TARGET_DRIVERS); do                                  \
                j=gallium_dri.so;                                       \
                k=$${i}_dri.so;                                         \
                ln -f $${dest_dir}/$${j}                                \