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 cf4a0252fb0ebb42bca27894e6224125701593a4..1094ffd496085ccc18b06f31f94c2a7899f8c2d6 100644 (file)
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -59,14 +59,9 @@ gallium_dri_la_LIBADD = \
 gallium_dri_la_LDFLAGS += \
        -Wl,--allow-multiple-definition
 
-MEGADRIVERS =
-STATIC_TARGET_CPPFLAGS =
-STATIC_TARGET_LIB_DEPS = \
-       $(top_builddir)/src/loader/libloader.la
-
 TARGET_DRIVERS =
 TARGET_CPPFLAGS =
-TARGET_LIB_DEPS =
+TARGET_LIB_DEPS = $(top_builddir)/src/loader/libloader.la
 
 include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc
 
@@ -74,81 +69,25 @@ include $(top_srcdir)/src/gallium/drivers/ilo/Automake.inc
 
 include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc
 
-if NEED_RADEON_DRM_WINSYS
-STATIC_TARGET_LIB_DEPS += \
-       $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la
-endif
-
-if HAVE_GALLIUM_RADEON_COMMON
-STATIC_TARGET_LIB_DEPS += \
-       $(top_builddir)/src/gallium/drivers/radeon/libradeon.la
-endif
-
-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
-
-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
-
-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
+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
 
-if HAVE_GALLIUM_VC4
-MEGADRIVERS += vc4
-STATIC_TARGET_CPPFLAGS += -DGALLIUM_VC4
-STATIC_TARGET_LIB_DEPS += \
-       $(top_builddir)/src/gallium/winsys/vc4/drm/libvc4drm.la \
-       $(top_builddir)/src/gallium/drivers/vc4/libvc4.la
-
-if USE_VC4_SIMULATOR
-STATIC_TARGET_CPPFLAGS += -DUSE_VC4_SIMULATOR
-endif
-endif
-
-if HAVE_GALLIUM_SOFTPIPE
-MEGADRIVERS += swrast
-STATIC_TARGET_CPPFLAGS += -DGALLIUM_SOFTPIPE
-STATIC_TARGET_LIB_DEPS += \
-       $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
-       $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
-
-if HAVE_DRI2
-MEGADRIVERS += kms_swrast
-STATIC_TARGET_LIB_DEPS += \
-       $(top_builddir)/src/gallium/winsys/sw/kms-dri/libswkmsdri.la
-endif
-endif
+include $(top_srcdir)/src/gallium/drivers/vc4/Automake.inc
 
-if NEED_GALLIUM_LLVMPIPE_DRIVER
-STATIC_TARGET_CPPFLAGS += -DGALLIUM_LLVMPIPE
-STATIC_TARGET_LIB_DEPS += \
-       $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
-endif
+include $(top_srcdir)/src/gallium/drivers/softpipe/Automake.inc
+include $(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc
 
 if HAVE_GALLIUM_STATIC_TARGETS
 
 gallium_dri_la_SOURCES += target.c
-AM_CPPFLAGS += $(STATIC_TARGET_CPPFLAGS) $(TARGET_CPPFLAGS)
-gallium_dri_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(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
 
@@ -169,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) $(TARGET_DRIVERS); do                   \
+       for i in $(TARGET_DRIVERS); do                                  \
                j=gallium_dri.so;                                       \
                k=$${i}_dri.so;                                         \
                ln -f .libs/$${j}                                       \
@@ -181,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) $(TARGET_DRIVERS); do                   \
+       for i in $(TARGET_DRIVERS); do                                  \
                j=gallium_dri.so;                                       \
                k=$${i}_dri.so;                                         \
                ln -f $${dest_dir}/$${j}                                \