From e70212356a73c0bfae59e945f2072372c10637ab Mon Sep 17 00:00:00 2001
From: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Date: Mon, 23 Apr 2018 17:31:57 +0200
Subject: [PATCH] Cleanup automake files

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
---
 Makefile.am     |  7 ++-----
 src/Makefile.am | 49 ++++++++++++++++---------------------------------
 2 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 099031a..71d08a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,5 @@ AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = src
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = \
-	aclocal.m4 compile config.guess config.sub \
-	configure depcomp install-sh ltmain.sh     \
-	Makefile.in missing
+MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure \
+	depcomp install-sh ltmain.sh Makefile.in missing
diff --git a/src/Makefile.am b/src/Makefile.am
index 8f4b9b4..29bed9f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,40 +1,23 @@
-AM_CPPFLAGS = \
-	-DPTHREADS		\
-	$(X11_DEPS_CFLAGS)\
-	$(DRM_CFLAGS)		\
-	$(LIBVA_DEPS_CFLAGS)
+AM_CPPFLAGS = -DPTHREADS $(X11_DEPS_CFLAGS) $(DRM_CFLAGS) $(LIBVA_DEPS_CFLAGS)
 
-driver_cflags = \
-	-Wall			\
-	-fvisibility=hidden
+backend_cflags = -Wall -fvisibility=hidden
+backend_ldflags = -module -avoid-version -no-undefined -Wl,--no-undefined
+backend_libs = -lpthread -ldl $(DRM_LIBS) $(X11_DEPS_LIBS) $(LIBVA_DEPS_LIBS)
 
-driver_ldflags = \
-	-module -avoid-version	\
-	-no-undefined		\
-	-Wl,--no-undefined
+backend_c = sunxi_cedrus.c object_heap.c config.c surface.c context.c buffer.c \
+	mpeg2.c picture.c subpicture.c image.c
 
-driver_libs = \
-	-lpthread -ldl		\
-	$(DRM_LIBS)		\
-	$(X11_DEPS_LIBS)	\
-	$(LIBVA_DEPS_LIBS)
+backend_s = tiled_yuv.S
 
-source_c = sunxi_cedrus.c object_heap.c buffer.c config.c \
-	context.c image.c mpeg2.c picture.c subpicture.c surface.c
+backend_h = sunxi_cedrus.h object_heap.h config.h surface.h context.h buffer.h \
+	mpeg2.h picture.h subpicture.h image.h tiled_yuv.h
 
-source_s = \
-	tiled_yuv.S
-
-source_h = sunxi_cedrus_drv_video.h object_heap.h buffer.h config.h \
-	context.h image.h mpeg2.h picture.h subpicture.h surface.h \
-	tiled_yuv.h
-
-sunxi_cedrus_drv_video_la_LTLIBRARIES	= sunxi_cedrus_drv_video.la
-sunxi_cedrus_drv_video_ladir		= $(LIBVA_DRIVERS_PATH)
-sunxi_cedrus_drv_video_la_CFLAGS	= $(driver_cflags)
-sunxi_cedrus_drv_video_la_LDFLAGS	= $(driver_ldflags)
-sunxi_cedrus_drv_video_la_LIBADD	= $(driver_libs)
-sunxi_cedrus_drv_video_la_SOURCES	= $(source_c) $(source_s)
-noinst_HEADERS				= $(source_h)
+sunxi_cedrus_drv_video_la_LTLIBRARIES = sunxi_cedrus_drv_video.la
+sunxi_cedrus_drv_video_ladir = $(LIBVA_DRIVERS_PATH)
+sunxi_cedrus_drv_video_la_CFLAGS = $(backend_cflags)
+sunxi_cedrus_drv_video_la_LDFLAGS = $(backend_ldflags)
+sunxi_cedrus_drv_video_la_LIBADD = $(backend_libs)
+sunxi_cedrus_drv_video_la_SOURCES = $(backend_c) $(backend_s)
+noinst_HEADERS = $(backend_h)
 
 MAINTAINERCLEANFILES = Makefile.in autoconfig.h.in