projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
gallium/svga: add automake target 'template'
[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 f9d348284521c30ec038f684bfcde701ea103647..cf4a0252fb0ebb42bca27894e6224125701593a4 100644 (file)
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -4,20 +4,17 @@ 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/common \
+       -I$(top_srcdir)/src/gallium/state_trackers/dri \
        $(GALLIUM_TARGET_CFLAGS)
 
 AM_CPPFLAGS = \
+       $(DEFINES) \
+       -DDRI_TARGET \
        -DGALLIUM_GALAHAD \
        -DGALLIUM_NOOP \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE
 
-if HAVE_GALLIUM_NOUVEAU
-AM_CPPFLAGS += \
-       -DDRI_TARGET
-endif
-
 dridir = $(DRI_DRIVER_INSTALL_DIR)
 dri_LTLIBRARIES = gallium_dri.la
 
@@ -29,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
@@ -37,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.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 \
@@ -52,8 +53,6 @@ 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.
@@ -65,32 +64,15 @@ 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
+TARGET_DRIVERS =
+TARGET_CPPFLAGS =
+TARGET_LIB_DEPS =
 
-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
+include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc
 
-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
+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 += \
@@ -126,27 +108,47 @@ STATIC_TARGET_LIB_DEPS += \
        $(RADEON_LIBS)
 endif
 
-if HAVE_GALLIUM_SVGA
-MEGADRIVERS += vmwgfx
-STATIC_TARGET_CPPFLAGS += -DGALLIUM_VMWGFX
+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/svga/drm/libsvgadrm.la \
-       $(top_builddir)/src/gallium/drivers/svga/libsvga.la
+       $(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_FREEDRENO
-MEGADRIVERS += freedreno
-STATIC_TARGET_CPPFLAGS += -DGALLIUM_FREEDRENO
+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/freedreno/drm/libfreedrenodrm.la \
-       $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \
-       $(FREEDRENO_LIBS)
+       $(top_builddir)/src/gallium/winsys/sw/kms-dri/libswkmsdri.la
+endif
+endif
 
+if NEED_GALLIUM_LLVMPIPE_DRIVER
+STATIC_TARGET_CPPFLAGS += -DGALLIUM_LLVMPIPE
+STATIC_TARGET_LIB_DEPS += \
+       $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
 endif
 
+if HAVE_GALLIUM_STATIC_TARGETS
+
 gallium_dri_la_SOURCES += target.c
-AM_CPPFLAGS += $(STATIC_TARGET_CPPFLAGS)
-gallium_dri_la_LIBADD += $(STATIC_TARGET_LIB_DEPS)
+AM_CPPFLAGS += $(STATIC_TARGET_CPPFLAGS) $(TARGET_CPPFLAGS)
+gallium_dri_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(TARGET_LIB_DEPS)
 
 else # HAVE_GALLIUM_STATIC_TARGETS
 
@@ -167,7 +169,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 $(MEGADRIVERS) $(TARGET_DRIVERS); do                   \
                j=gallium_dri.so;                                       \
                k=$${i}_dri.so;                                         \
                ln -f .libs/$${j}                                       \
@@ -179,7 +181,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 $(MEGADRIVERS) $(TARGET_DRIVERS); do                   \
                j=gallium_dri.so;                                       \
                k=$${i}_dri.so;                                         \
                ln -f $${dest_dir}/$${j}                                \