From bd39ded985e4decd9e5bfc3aa9ccf9fbb5ec88f4 Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Thu, 27 Sep 2012 15:16:59 +0200 Subject: [PATCH] build: drop useless Makefile variables. libvacorelib and libvabackendlib variables are totally useless nowadays since test cases use a common infrastructure for VA display options and that other test cases are X11 specific anyway. Signed-off-by: Gwenole Beauchesne --- configure.ac | 9 --------- dummy_drv_video/Makefile.am | 4 ++-- test/basic/Makefile.am | 2 +- test/common/Makefile.am | 5 ++--- test/decode/Makefile.am | 4 ++-- test/encode/Makefile.am | 4 ++-- test/putsurface/Makefile.am | 4 ++-- test/transcode/Makefile.am | 2 +- test/vainfo/Makefile.am | 4 ++-- va/Makefile.am | 28 ++++++++++++++-------------- 10 files changed, 28 insertions(+), 38 deletions(-) diff --git a/configure.ac b/configure.ac index f25f3d9..af9bf82 100644 --- a/configure.ac +++ b/configure.ac @@ -296,15 +296,6 @@ if test "$USE_DRM:$USE_X11:$USE_WAYLAND" = "no:no:no"; then AC_MSG_ERROR([Please select at least one backend (DRM, X11, Wayland)]) fi -LIBVA_DISPLAY="drm" -if test "$USE_X11" = "yes"; then - LIBVA_DISPLAY="x11" -fi -libvacorelib=libva.la -libvabackendlib=libva-$LIBVA_DISPLAY.la -AC_SUBST([libvacorelib]) -AC_SUBST([libvabackendlib]) - AC_OUTPUT([ Makefile debian.upstream/Makefile diff --git a/dummy_drv_video/Makefile.am b/dummy_drv_video/Makefile.am index 245e6e8..69364c2 100644 --- a/dummy_drv_video/Makefile.am +++ b/dummy_drv_video/Makefile.am @@ -26,8 +26,8 @@ if BUILD_DUMMY_DRIVER dummy_drv_video_la_LTLIBRARIES = dummy_drv_video.la dummy_drv_video_ladir = $(LIBVA_DRIVERS_PATH) dummy_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined -dummy_drv_video_la_LIBADD = $(top_builddir)/va/$(libvabackendlib) -dummy_drv_video_la_DEPENDENCIES = $(top_builddir)/va/$(libvabackendlib) +dummy_drv_video_la_LIBADD = $(top_builddir)/va/libva-x11.la +dummy_drv_video_la_DEPENDENCIES = $(top_builddir)/va/libva-x11.la dummy_drv_video_la_SOURCES = dummy_drv_video.c object_heap.c noinst_HEADERS = dummy_drv_video.h object_heap.h endif diff --git a/test/basic/Makefile.am b/test/basic/Makefile.am index 169e193..2480022 100644 --- a/test/basic/Makefile.am +++ b/test/basic/Makefile.am @@ -25,7 +25,7 @@ noinst_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \ AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 -TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) $(top_builddir)/va/$(libvacorelib) -lpthread -lX11 +TEST_LIBS = $(top_builddir)/va/libva-x11.la $(top_builddir)/va/libva.la -lpthread -lX11 test_01_LDADD = $(TEST_LIBS) test_01_SOURCES = test_01.c diff --git a/test/common/Makefile.am b/test/common/Makefile.am index 56b4cc2..9bc4aeb 100644 --- a/test/common/Makefile.am +++ b/test/common/Makefile.am @@ -29,8 +29,7 @@ libva_display_cflags = \ $(NULL) libva_display_libs = \ - $(top_builddir)/va/$(libvacorelib) \ - $(top_builddir)/va/$(libvabackendlib) \ + $(top_builddir)/va/libva.la \ $(NULL) source_c = va_display.c @@ -39,7 +38,7 @@ source_h = va_display.h if USE_X11 source_c += va_display_x11.c libva_display_cflags += $(X11_CFLAGS) -libva_display_libs += $(X11_LIBS) +libva_display_libs += $(top_builddir)/va/libva-x11.la $(X11_LIBS) endif if USE_DRM diff --git a/test/decode/Makefile.am b/test/decode/Makefile.am index 477383c..5513b87 100644 --- a/test/decode/Makefile.am +++ b/test/decode/Makefile.am @@ -32,8 +32,8 @@ INCLUDES = \ $(NULL) TEST_LIBS = \ - $(top_builddir)/va/$(libvabackendlib) \ - $(top_builddir)/va/$(libvacorelib) \ + $(top_builddir)/va/libva-x11.la \ + $(top_builddir)/va/libva.la \ $(libva_helpers) \ $(NULL) diff --git a/test/encode/Makefile.am b/test/encode/Makefile.am index 94e5edf..f12c890 100644 --- a/test/encode/Makefile.am +++ b/test/encode/Makefile.am @@ -35,8 +35,8 @@ INCLUDES = \ $(NULL) TEST_LIBS = \ - $(top_builddir)/va/$(libvabackendlib) \ - $(top_builddir)/va/$(libvacorelib) \ + $(top_builddir)/va/libva-x11.la \ + $(top_builddir)/va/libva.la \ $(libva_helpers) \ $(NULL) diff --git a/test/putsurface/Makefile.am b/test/putsurface/Makefile.am index 20d3626..82927bf 100644 --- a/test/putsurface/Makefile.am +++ b/test/putsurface/Makefile.am @@ -32,14 +32,14 @@ TEST_CFLAGS = \ $(NULL) TEST_LIBS = \ - $(top_builddir)/va/$(libvacorelib) \ + $(top_builddir)/va/libva.la \ -lpthread \ $(NULL) putsurface_SOURCES = putsurface_x11.c putsurface_CFLAGS = $(X11_CFLAGS) $(TEST_CFLAGS) putsurface_LDADD = $(X11_LIBS) $(TEST_LIBS) \ - $(top_builddir)/va/$(libvabackendlib) \ + $(top_builddir)/va/libva-x11.la \ $(NULL) if USE_WAYLAND diff --git a/test/transcode/Makefile.am b/test/transcode/Makefile.am index a721381..f074b37 100644 --- a/test/transcode/Makefile.am +++ b/test/transcode/Makefile.am @@ -24,7 +24,7 @@ bin_PROGRAMS = mpeg2transcode INCLUDES = -I$(top_srcdir) -TEST_LIBS = $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/$(libvabackendlib) -lX11 +TEST_LIBS = $(top_builddir)/va/libva.la $(top_builddir)/va/libva-x11.la -lX11 mpeg2transcode_LDADD = $(TEST_LIBS) mpeg2transcode_SOURCES = mpeg2transcode.cpp diff --git a/test/vainfo/Makefile.am b/test/vainfo/Makefile.am index e0db1a3..6e1ee4c 100644 --- a/test/vainfo/Makefile.am +++ b/test/vainfo/Makefile.am @@ -34,8 +34,8 @@ vainfo_cflags = \ $(NULL) vainfo_libs = \ - $(top_builddir)/va/$(libvacorelib) \ - $(top_builddir)/va/$(libvabackendlib) \ + $(top_builddir)/va/libva.la \ + $(top_builddir)/va/libva-x11.la \ $(libva_helpers) \ $(NULL) diff --git a/va/Makefile.am b/va/Makefile.am index 6a89b21..7ffde12 100644 --- a/va/Makefile.am +++ b/va/Makefile.am @@ -79,16 +79,16 @@ libva_la_LIBADD = $(LIBVA_LIBS) -ldl lib_LTLIBRARIES += libva-tpi.la libva_tpi_la_SOURCES = va_tpi.c libva_tpi_la_LDFLAGS = $(LDADD) -no-undefined -libva_tpi_la_DEPENDENCIES = $(libvacorelib) -libva_tpi_la_LIBADD = $(libvacorelib) -ldl +libva_tpi_la_DEPENDENCIES = libva.la +libva_tpi_la_LIBADD = libva.la -ldl if USE_DRM SUBDIRS += drm lib_LTLIBRARIES += libva-drm.la libva_drm_la_SOURCES = libva_drm_la_LDFLAGS = $(LDADD) -libva_drm_la_DEPENDENCIES = $(libvacorelib) drm/libva_drm.la -libva_drm_la_LIBADD = $(libvacorelib) drm/libva_drm.la \ +libva_drm_la_DEPENDENCIES = libva.la drm/libva_drm.la +libva_drm_la_LIBADD = libva.la drm/libva_drm.la \ $(LIBVA_LIBS) $(DRM_LIBS) -ldl endif @@ -98,8 +98,8 @@ lib_LTLIBRARIES += libva-x11.la libva_source_h += va_x11.h libva_x11_la_SOURCES = libva_x11_la_LDFLAGS = $(LDADD) -libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la -libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la \ +libva_x11_la_DEPENDENCIES = libva.la x11/libva_x11.la +libva_x11_la_LIBADD = libva.la x11/libva_x11.la \ $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(XFIXES_LIBS) $(DRM_LIBS) -ldl endif @@ -108,8 +108,8 @@ SUBDIRS += glx lib_LTLIBRARIES += libva-glx.la libva_glx_la_SOURCES = libva_glx_la_LDFLAGS = $(LDADD) -libva_glx_la_DEPENDENCIES = $(libvacorelib) glx/libva_glx.la libva-x11.la -libva_glx_la_LIBADD = $(libvacorelib) glx/libva_glx.la libva-x11.la \ +libva_glx_la_DEPENDENCIES = libva.la glx/libva_glx.la libva-x11.la +libva_glx_la_LIBADD = libva.la glx/libva_glx.la libva-x11.la \ $(GLX_LIBS) -ldl endif @@ -118,8 +118,8 @@ SUBDIRS += egl lib_LTLIBRARIES += libva-egl.la libva_egl_la_SOURCES = libva_egl_la_LDFLAGS = $(LDADD) -libva_egl_la_DEPENDENCIES = $(libvacorelib) egl/libva_egl.la libva-x11.la -libva_egl_la_LIBADD = $(libvacorelib) egl/libva_egl.la libva-x11.la \ +libva_egl_la_DEPENDENCIES = libva.la egl/libva_egl.la libva-x11.la +libva_egl_la_LIBADD = libva.la egl/libva_egl.la libva-x11.la \ $(EGL_LIBS) -ldl endif @@ -128,8 +128,8 @@ SUBDIRS += wayland lib_LTLIBRARIES += libva-wayland.la libva_wayland_la_SOURCES = libva_wayland_la_LDFLAGS = $(LDADD) -libva_wayland_la_DEPENDENCIES = $(libvacorelib) wayland/libva_wayland.la -libva_wayland_la_LIBADD = $(libvacorelib) wayland/libva_wayland.la \ +libva_wayland_la_DEPENDENCIES = libva.la wayland/libva_wayland.la +libva_wayland_la_LIBADD = libva.la wayland/libva_wayland.la \ $(WAYLAND_LIBS) $(DRM_LIBS) -ldl endif @@ -138,8 +138,8 @@ SUBDIRS += dummy lib_LTLIBRARIES += libva-dummy.la libva_dummy_la_SOURCES = libva_dummy_la_LDFLAGS = $(LDADD) -libva_dummy_la_DEPENDENCIES = $(libvacorelib) dummy/libva_dummy.la -libva_dummy_la_LIBADD = $(libvacorelib) dummy/libva_dummy.la \ +libva_dummy_la_DEPENDENCIES = libva.la dummy/libva_dummy.la +libva_dummy_la_LIBADD = libva.la dummy/libva_dummy.la \ $(LIBVA_LIBS) $(DRM_LIBS) endif -- 2.7.4