AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium/softpipe,llvmpipe: add automake target 'templates'

Browse Source 
Rather than duplicating the libdeps, extra define... all over the
targets, define them only once and use when applicable.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Emil Velikov
2014-09-21 16:46:39 +01:00
parent 29c4ae0ebf
commit 0f3c0ff17b
4 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gallium/drivers/llvmpipe/Automake.inc Normal file
View File

@@ -0,0 +1,7 @@
if HAVE_GALLIUM_LLVMPIPE
TARGET_CPPFLAGS += -DGALLIUM_LLVMPIPE
TARGET_LIB_DEPS += \
$(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
endif

15
src/gallium/drivers/softpipe/Automake.inc Normal file
View File

@@ -0,0 +1,15 @@
if HAVE_GALLIUM_SOFTPIPE
TARGET_DRIVERS += swrast
TARGET_CPPFLAGS += -DGALLIUM_SOFTPIPE
TARGET_LIB_DEPS += \
$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
if HAVE_DRI2
TARGET_DRIVERS += kms_swrast
TARGET_LIB_DEPS += \
$(top_builddir)/src/gallium/winsys/sw/kms-dri/libswkmsdri.la
endif
endif

21
src/gallium/targets/dri/Makefile.am
View File

@@ -84,25 +84,8 @@ include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
include $(top_srcdir)/src/gallium/drivers/vc4/Automake.inc
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
if HAVE_GALLIUM_LLVMPIPE
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

13
src/gallium/targets/egl-static/Makefile.am
View File

@@ -175,17 +175,8 @@ include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc
include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
if HAVE_GALLIUM_SOFTPIPE
egl_gallium_la_CPPFLAGS += -DGALLIUM_SOFTPIPE
egl_gallium_la_LIBADD += \
$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
endif
if HAVE_GALLIUM_LLVMPIPE
egl_gallium_la_CPPFLAGS += -DGALLIUM_LLVMPIPE
egl_gallium_la_LIBADD += \
$(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
egl_gallium_la_CPPFLAGS += $(TARGET_CPPFLAGS)
egl_gallium_la_LIBADD += $(TARGET_LIB_DEPS) \