From c2b5d7024e8b348fca5f666376d07685d1a45a8c Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 24 Sep 2014 00:30:45 +0100 Subject: gallium/r300,r600,radeonsi: add automake target 'templates' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rather than duplicating the libdeps, extra define... all over the targets, define them only once and use when applicable. Signed-off-by: Emil Velikov Acked-by: Christian König Acked-by: Matt Turner --- src/gallium/targets/egl-static/Makefile.am | 37 +++++------------------------- 1 file changed, 6 insertions(+), 31 deletions(-) (limited to 'src/gallium/targets/egl-static/Makefile.am') diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am index 507c957..472eea7 100644 --- a/src/gallium/targets/egl-static/Makefile.am +++ b/src/gallium/targets/egl-static/Makefile.am @@ -167,36 +167,9 @@ include $(top_srcdir)/src/gallium/drivers/ilo/Automake.inc include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc -if NEED_RADEON_DRM_WINSYS -egl_gallium_la_LIBADD += \ - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la -endif - -if HAVE_GALLIUM_RADEON_COMMON -egl_gallium_la_LIBADD += \ - $(top_builddir)/src/gallium/drivers/radeon/libradeon.la -endif - -if HAVE_GALLIUM_R300 -egl_gallium_la_CPPFLAGS += -DGALLIUM_R300 -egl_gallium_la_LIBADD += \ - $(top_builddir)/src/gallium/drivers/r300/libr300.la \ - $(RADEON_LIBS) -endif - -if HAVE_GALLIUM_R600 -egl_gallium_la_CPPFLAGS += -DGALLIUM_R600 -egl_gallium_la_LIBADD += \ - $(top_builddir)/src/gallium/drivers/r600/libr600.la \ - $(RADEON_LIBS) -endif - -if HAVE_GALLIUM_RADEONSI -egl_gallium_la_CPPFLAGS += -DGALLIUM_RADEONSI -egl_gallium_la_LIBADD += \ - $(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 @@ -215,7 +188,9 @@ egl_gallium_la_LIBADD += \ endif egl_gallium_la_CPPFLAGS += $(TARGET_CPPFLAGS) -egl_gallium_la_LIBADD += $(TARGET_LIB_DEPS) +egl_gallium_la_LIBADD += $(TARGET_LIB_DEPS) \ + $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) + #else # HAVE_GALLIUM_STATIC_TARGETS -- cgit v1.1