Skip to content

L
libva
Commit 3b3cd9ac authored by Gwenole Beauchesne's avatar Gwenole Beauchesne Committed by Austin Yuan
Browse files
Options

cosmetics: clean up Makefiles.

parent 0938f1a2
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 73 deletions
va/Makefile.am
View file @ 3b3cd9ac
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SUBDIRS =
INCLUDES = \ INCLUDES = \
$(LIBVA_CFLAGS) -I$(top_srcdir)/va/x11 \ $(LIBVA_CFLAGS) -I$(top_srcdir)/va/x11 \
-DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\"" -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\""
...@@ -27,76 +29,84 @@ INCLUDES = \ ...@@ -27,76 +29,84 @@ INCLUDES = \
LDADD = \ LDADD = \
$(LIBVA_LT_LDFLAGS) $(LIBVA_LT_LDFLAGS)
libva_la_SOURCES = va.c va_trace.c va_fool.c va_fool_getframe.c libva_source_c = \
libva_ladir = $(libdir) va.c \
libva_la_LDFLAGS = $(LDADD) -no-undefined va_fool.c \
libva_la_LIBADD = $(LIBVA_LIBS) -ldl va_fool_getframe.c \
va_trace.c \
libva_tpi_la_SOURCES = va_tpi.c $(NULL)
libva_tpi_ladir = $(libdir)
libva_tpi_la_LDFLAGS = $(LDADD) -no-undefined libva_source_h = \
libva_tpi_la_LIBADD = $(libvacorelib) -ldl va.h \
libva_tpi_la_DEPENDENCIES = $(libvacorelib) va_backend.h \
va_backend_tpi.h \
va_dummy.h \
libva_x11_backend = libva-x11.la va_tpi.h \
libva_x11_backenddir = x11 va_version.h \
va_x11.h \
libva_x11_la_SOURCES = $(NULL)
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_source_h_priv = \
libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la $(NULL)
if BUILD_DUMMY_BACKEND lib_LTLIBRARIES = libva.la
libva_dummy_backend = libva-dummy.la libvaincludedir = ${includedir}/va
libva_dummy_backenddir = dummy libvainclude_HEADERS = $(libva_source_h)
noinst_HEADERS = $(libva_source_h_priv)
libva_dummy_la_SOURCES = libva_la_SOURCES = $(libva_source_c)
libva_dummy_la_LIBADD = $(libvacorelib) dummy/libva_dummy.la $(LIBVA_LIBS) $(DRM_LIBS) libva_la_LDFLAGS = $(LDADD) -no-undefined
libva_dummy_la_LDFLAGS = $(LDADD) libva_la_LIBADD = $(LIBVA_LIBS) -ldl
libva_dummy_la_DEPENDENCIES = $(libvacorelib) dummy/libva_dummy.la
else lib_LTLIBRARIES += libva-tpi.la
libva_dummy_backend = libva_tpi_la_SOURCES = va_tpi.c
libva_dummy_backenddir = libva_tpi_la_LDFLAGS = $(LDADD) -no-undefined
endif 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
if USE_GLX if USE_GLX
libva_glx_backend = libva-glx.la SUBDIRS += glx
libva_glx_backenddir = glx lib_LTLIBRARIES += libva-glx.la
libva_glx_la_SOURCES =
libva_glx_la_SOURCES = libva_glx_la_LDFLAGS = $(LDADD)
libva_glx_la_LIBADD = $(libvacorelib) glx/libva_glx.la libva-x11.la $(GL_DEPS_LIBS) -ldl libva_glx_la_DEPENDENCIES = $(libvacorelib) glx/libva_glx.la libva-x11.la
libva_glx_la_LDFLAGS = $(LDADD) libva_glx_la_LIBADD = $(libvacorelib) glx/libva_glx.la libva-x11.la \
libva_glx_la_DEPENDENCIES = $(libvacorelib) glx/libva_glx.la libva-x11.la $(GL_DEPS_LIBS) -ldl
else
libva_glx_backend =
libva_glx_backenddir =
endif endif
if USE_EGL if USE_EGL
libva_egl_backend = libva-egl.la SUBDIRS += egl
libva_egl_backenddir = egl lib_LTLIBRARIES += libva-egl.la
libva_egl_la_SOURCES = libva_egl_la_SOURCES =
libva_egl_la_LIBADD = $(libvacorelib) egl/libva_egl.la libva-x11.la $(GL_DEPS_LIBS) -ldl libva_egl_la_LDFLAGS = $(LDADD)
libva_egl_la_LDFLAGS = $(LDADD) libva_egl_la_DEPENDENCIES = $(libvacorelib) egl/libva_egl.la libva-x11.la
libva_egl_la_DEPENDENCIES = $(libvacorelib) egl/libva_egl.la libva-x11.la libva_egl_la_LIBADD = $(libvacorelib) egl/libva_egl.la libva-x11.la \
else $(GL_DEPS_LIBS) -ldl
libva_egl_backend =
libva_egl_backenddir =
endif endif
lib_LTLIBRARIES = libva.la libva-tpi.la $(libva_x11_backend) $(libva_dummy_backend) $(libva_glx_backend) $(libva_egl_backend) if BUILD_DUMMY_BACKEND
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_LIBS) $(DRM_LIBS)
endif
DIST_SUBDIRS = x11 glx egl dummy DIST_SUBDIRS = x11 glx egl dummy
SUBDIRS = $(libva_x11_backenddir) $(libva_dummy_backenddir) $(libva_glx_backenddir) $(libva_egl_backenddir)
libvaincludedir = ${includedir}/va
libvainclude_HEADERS = va.h va_tpi.h va_x11.h va_backend.h va_dummy.h va_version.h va_backend_tpi.h
DISTCLEANFILES = \ DISTCLEANFILES = \
va_version.h va_version.h \
$(NULL)
EXTRA_DIST = \ EXTRA_DIST = \
va_version.h.in va_version.h.in \
$(NULL)
va/glx/Makefile.am
View file @ 3b3cd9ac
...@@ -24,18 +24,21 @@ AM_CFLAGS = -DLINUX -I$(top_srcdir)/va -I$(top_srcdir)/va/x11 ...@@ -24,18 +24,21 @@ AM_CFLAGS = -DLINUX -I$(top_srcdir)/va -I$(top_srcdir)/va/x11
source_c = \ source_c = \
va_glx.c \ va_glx.c \
va_glx_impl.c va_glx_impl.c \
$(NULL)
source_h = \ source_h = \
va_backend_glx.h \
va_glx.h \ va_glx.h \
va_backend_glx.h $(NULL)
source_h_priv = \ source_h_priv = \
va_glx_impl.h \ va_glx_impl.h \
va_glx_private.h va_glx_private.h \
$(NULL)
noinst_LTLIBRARIES = libva_glx.la noinst_LTLIBRARIES = libva_glx.la
libva_glxincludedir = ${includedir}/va libva_glxincludedir = ${includedir}/va
libva_glxinclude_HEADERS = $(source_h) libva_glxinclude_HEADERS = $(source_h)
libva_glx_la_SOURCES = $(source_c) libva_glx_la_SOURCES = $(source_c)
noinst_HEADERS = $(source_h_priv) noinst_HEADERS = $(source_h_priv)
va/x11/Makefile.am
View file @ 3b3cd9ac
...@@ -22,11 +22,33 @@ ...@@ -22,11 +22,33 @@
AM_CFLAGS = -DLINUX -I$(top_srcdir)/va $(DRM_CFLAGS) AM_CFLAGS = -DLINUX -I$(top_srcdir)/va $(DRM_CFLAGS)
noinst_LTLIBRARIES = libva_x11.la source_c = \
dri1_util.c \
dri2_util.c \
va_dri.c \
va_dri2.c \
va_dricommon.c \
va_fglrx.c \
va_nvctrl.c \
va_x11.c \
$(NULL)
libva_x11includedir = ${includedir}/va source_h = \
libva_x11include_HEADERS = va_dri.h va_dri2.h va_dricommon.h va_dri.h \
va_dri2.h \
va_dricommon.h \
$(NULL)
libva_x11_la_SOURCES = va_x11.c va_dri.c va_dri2.c va_dricommon.c dri2_util.c dri1_util.c va_nvctrl.c va_fglrx.c source_h_priv = \
va_dri2str.h \
va_dri2tokens.h \
va_dristr.h \
va_fglrx.h \
va_nvctrl.h \
$(NULL)
EXTRA_DIST = va_dristr.h va_dri2str.h va_dri2tokens.h va_nvctrl.h va_fglrx.h noinst_LTLIBRARIES = libva_x11.la
libva_x11includedir = ${includedir}/va
libva_x11include_HEADERS = $(source_h)
libva_x11_la_SOURCES = $(source_c)
noinst_HEADERS = $(source_h_priv)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment