Merge pull request #16 from seanvk/master

[android-x86/hardware-intel-common-libva.git] / va / Makefile.am

diff --git a/va/Makefile.am b/va/Makefile.am
index 3bc0904..1be4214 100644 (file)
--- a/va/Makefile.am
+++ b/va/Makefile.am
@@ -22,7 +22,7 @@
 
 SUBDIRS =
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\""
 
@@ -31,6 +31,7 @@ LDADD = \
 
 libva_source_c = \
        va.c                    \
+       va_compat.c             \
        va_fool.c               \
        va_trace.c              \
        $(NULL)
@@ -39,11 +40,22 @@ libva_source_h = \
        va.h                    \
        va_backend.h            \
        va_backend_tpi.h        \
+       va_backend_vpp.h        \
+       va_compat.h             \
+       va_dec_hevc.h           \
        va_dec_jpeg.h           \
+       va_dec_vp8.h            \
+       va_dec_vp9.h            \
        va_drmcommon.h          \
-       va_dummy.h              \
+       va_enc_hevc.h           \
+       va_enc_h264.h           \
+       va_enc_jpeg.h           \
+       va_enc_vp8.h            \
+       va_enc_mpeg2.h          \
+       va_enc_vp9.h            \
        va_tpi.h                \
        va_version.h            \
+       va_vpp.h                \
        $(NULL)
 
 libva_source_h_priv = \
@@ -52,12 +64,18 @@ libva_source_h_priv = \
        va_trace.h              \
        $(NULL)
 
+libva_ldflags = \
+       $(LDADD) -no-undefined  \
+       -Wl,-version-script,${srcdir}/libva.syms \
+       $(NULL)
+
 lib_LTLIBRARIES                        = libva.la
 libvaincludedir                        = ${includedir}/va
 libvainclude_HEADERS           = $(libva_source_h)
 noinst_HEADERS                 = $(libva_source_h_priv)
 libva_la_SOURCES               = $(libva_source_c)
-libva_la_LDFLAGS               = $(LDADD) -no-undefined
+libva_la_LDFLAGS               = $(libva_ldflags)
+libva_la_DEPENDENCIES          = libva.syms
 libva_la_LIBADD                        = $(LIBVA_LIBS) -ldl
 
 lib_LTLIBRARIES                        += libva-tpi.la
@@ -102,8 +120,8 @@ SUBDIRS                             += egl
 lib_LTLIBRARIES                        += libva-egl.la
 libva_egl_la_SOURCES           =
 libva_egl_la_LDFLAGS           = $(LDADD)
-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 \
+libva_egl_la_DEPENDENCIES      = libva.la egl/libva_egl.la 
+libva_egl_la_LIBADD            = libva.la egl/libva_egl.la \
        $(EGL_LIBS) -ldl
 endif
 
@@ -117,22 +135,13 @@ libva_wayland_la_LIBADD           = libva.la wayland/libva_wayland.la \
        $(WAYLAND_LIBS) $(DRM_LIBS) -ldl
 endif
 
-if BUILD_DUMMY_BACKEND
-SUBDIRS                                += dummy
-lib_LTLIBRARIES                        += libva-dummy.la
-libva_dummy_la_SOURCES         = 
-libva_dummy_la_LDFLAGS         = $(LDADD)
-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
-
-DIST_SUBDIRS = x11 glx egl dummy drm wayland
+DIST_SUBDIRS = x11 glx egl drm wayland
 
 DISTCLEANFILES = \
        va_version.h            \
        $(NULL)
 
 EXTRA_DIST = \
+       libva.syms              \
        va_version.h.in         \
        $(NULL)