-libva_la_SOURCES = va.c va_trace.c va_fool.c va_fool_getframe.c
-libva_ladir = $(libdir)
-libva_la_LDFLAGS = $(LDADD) -no-undefined
-libva_la_LIBADD = $(LIBVA_LIBS) -ldl
-
-libva_tpi_la_SOURCES = va_tpi.c
-libva_tpi_ladir = $(libdir)
-libva_tpi_la_LDFLAGS = $(LDADD) -no-undefined
-libva_tpi_la_LIBADD = $(libvacorelib) -ldl
-libva_tpi_la_DEPENDENCIES = $(libvacorelib)
-
-
-libva_x11_backend = libva-x11.la
-libva_x11_backenddir = x11
-
-libva_x11_la_SOURCES =
-libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) -ldl
-libva_x11_la_LDFLAGS = $(LDADD)
-libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la
-
-if BUILD_DUMMY_BACKEND
-libva_dummy_backend = libva-dummy.la
-libva_dummy_backenddir = dummy
-
-libva_dummy_la_SOURCES =
-libva_dummy_la_LIBADD = $(libvacorelib) dummy/libva_dummy.la $(LIBVA_LIBS) $(DRM_LIBS)
-libva_dummy_la_LDFLAGS = $(LDADD)
-libva_dummy_la_DEPENDENCIES = $(libvacorelib) dummy/libva_dummy.la
-else
-libva_dummy_backend =
-libva_dummy_backenddir =
-endif
+libva_source_c = \
+ va.c \
+ va_fool.c \
+ va_fool_getframe.c \
+ va_trace.c \
+ $(NULL)
+
+libva_source_h = \
+ va.h \
+ va_backend.h \
+ va_backend_tpi.h \
+ va_dummy.h \
+ va_tpi.h \
+ va_version.h \
+ va_x11.h \
+ $(NULL)
+
+libva_source_h_priv = \
+ $(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_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
+
+SUBDIRS += x11
+lib_LTLIBRARIES += libva-x11.la
+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_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) -ldl