diff options
| -rw-r--r-- | src/gallium/drivers/r300/Automake.inc | 13 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/Automake.inc | 16 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/Automake.inc | 16 | ||||
| -rw-r--r-- | src/gallium/targets/dri/Makefile.am | 39 | ||||
| -rw-r--r-- | src/gallium/targets/egl-static/Makefile.am | 37 | ||||
| -rw-r--r-- | src/gallium/targets/gbm/Makefile.am | 36 | ||||
| -rw-r--r-- | src/gallium/targets/omx/Makefile.am | 34 | ||||
| -rw-r--r-- | src/gallium/targets/vdpau/Makefile.am | 36 | ||||
| -rw-r--r-- | src/gallium/targets/xvmc/Makefile.am | 13 |
9 files changed, 72 insertions, 168 deletions
diff --git a/src/gallium/drivers/r300/Automake.inc b/src/gallium/drivers/r300/Automake.inc new file mode 100644 index 00000000000..42614cb347b --- /dev/null +++ b/src/gallium/drivers/r300/Automake.inc @@ -0,0 +1,13 @@ +if HAVE_GALLIUM_R300 + +TARGET_DRIVERS += r300 +TARGET_CPPFLAGS += -DGALLIUM_R300 +TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/drivers/r300/libr300.la \ + $(RADEON_LIBS) \ + $(INTEL_LIBS) + +TARGET_RADEON_WINSYS ?= \ + $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la + +endif diff --git a/src/gallium/drivers/r600/Automake.inc b/src/gallium/drivers/r600/Automake.inc new file mode 100644 index 00000000000..014f4156fe6 --- /dev/null +++ b/src/gallium/drivers/r600/Automake.inc @@ -0,0 +1,16 @@ +if HAVE_GALLIUM_R600 + +TARGET_DRIVERS += r600 +TARGET_CPPFLAGS += -DGALLIUM_R600 +TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/drivers/r600/libr600.la \ + $(RADEON_LIBS) \ + $(LIBDRM_LIBS) + +TARGET_RADEON_WINSYS ?= \ + $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la + +TARGET_RADEON_COMMON ?= \ + $(top_builddir)/src/gallium/drivers/radeon/libradeon.la + +endif diff --git a/src/gallium/drivers/radeonsi/Automake.inc b/src/gallium/drivers/radeonsi/Automake.inc new file mode 100644 index 00000000000..3f212b39769 --- /dev/null +++ b/src/gallium/drivers/radeonsi/Automake.inc @@ -0,0 +1,16 @@ +if HAVE_GALLIUM_RADEONSI + +TARGET_DRIVERS += radeonsi +TARGET_CPPFLAGS += -DGALLIUM_RADEONSI +TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ + $(RADEON_LIBS) \ + $(LIBDRM_LIBS) + +TARGET_RADEON_WINSYS ?= \ + $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la + +TARGET_RADEON_COMMON ?= \ + $(top_builddir)/src/gallium/drivers/radeon/libradeon.la + +endif diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index cf4a0252fb0..0143694171a 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -74,39 +74,9 @@ 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 @@ -148,7 +118,8 @@ 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_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(TARGET_LIB_DEPS) \ + $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) else # HAVE_GALLIUM_STATIC_TARGETS diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am index 507c9574d28..472eea74b29 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 diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index f1166f0d631..ddd558ed382 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -66,36 +66,9 @@ 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 -STATIC_TARGET_CPPFLAGS += -DGALLIUM_R300 -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/drivers/r300/libr300.la \ - $(RADEON_LIBS) -endif - -if HAVE_GALLIUM_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 -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 @@ -103,7 +76,8 @@ include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc gbm_gallium_drm_la_SOURCES += target.c gbm_gallium_drm_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) $(TARGET_CPPFLAGS) -gbm_gallium_drm_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(TARGET_LIB_DEPS) +gbm_gallium_drm_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(TARGET_LIB_DEPS) \ + $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) else # HAVE_GALLIUM_STATIC_TARGETS gbm_gallium_drm_la_LIBADD += \ diff --git a/src/gallium/targets/omx/Makefile.am b/src/gallium/targets/omx/Makefile.am index c99777e2782..db6500c9450 100644 --- a/src/gallium/targets/omx/Makefile.am +++ b/src/gallium/targets/omx/Makefile.am @@ -42,39 +42,13 @@ TARGET_LIB_DEPS = include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc -# Radeon winsys chaos -if HAVE_GALLIUM_R600 -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la -else -if HAVE_GALLIUM_RADEONSI -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la -endif -endif - -if HAVE_GALLIUM_RADEON_COMMON -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/drivers/radeon/libradeon.la -endif - -if HAVE_GALLIUM_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 -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/r600/Automake.inc +include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc libomx_mesa_la_SOURCES += target.c libomx_mesa_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) $(TARGET_CPPFLAGS) -libomx_mesa_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(TARGET_LIB_DEPS) +libomx_mesa_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(TARGET_LIB_DEPS) \ + $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) else # HAVE_GALLIUM_STATIC_TARGETS diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am index 27af05e094a..8f5d66d4da8 100644 --- a/src/gallium/targets/vdpau/Makefile.am +++ b/src/gallium/targets/vdpau/Makefile.am @@ -48,43 +48,15 @@ TARGET_LIB_DEPS = include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc -# Radeon winsys chaos -if HAVE_GALLIUM_R600 -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la -else -if HAVE_GALLIUM_RADEONSI -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la -endif -endif - -if HAVE_GALLIUM_RADEON_COMMON -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/drivers/radeon/libradeon.la -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/r600/Automake.inc +include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc if HAVE_GALLIUM_STATIC_TARGETS libvdpau_gallium_la_SOURCES += target.c libvdpau_gallium_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) $(TARGET_CPPFLAGS) -libvdpau_gallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(TARGET_LIB_DEPS) +libvdpau_gallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(TARGET_LIB_DEPS) \ + $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) else # HAVE_GALLIUM_STATIC_TARGETS diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am index 041d920ed3e..812e597a277 100644 --- a/src/gallium/targets/xvmc/Makefile.am +++ b/src/gallium/targets/xvmc/Makefile.am @@ -43,21 +43,14 @@ TARGET_LIB_DEPS = 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/winsys/radeon/drm/libradeonwinsys.la \ - $(top_builddir)/src/gallium/drivers/radeon/libradeon.la \ - $(top_builddir)/src/gallium/drivers/r600/libr600.la \ - $(RADEON_LIBS) -endif +include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc if HAVE_GALLIUM_STATIC_TARGETS libXvMCgallium_la_SOURCES += target.c libXvMCgallium_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) $(TARGET_CPPFLAGS) -libXvMCgallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(TARGET_LIB_DEPS) +libXvMCgallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) $(TARGET_LIB_DEPS) \ + $(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON) else # HAVE_GALLIUM_STATIC_TARGETS |