From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 10 Jun 2014 16:29:38 +0000 (+0200)
Subject: Makefile: Simplify (and probably fix) the ffdecsa rules
X-Git-Tag: v4.1~1944
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fc3a4681031eebe6d996efd76bda83fe9aaf392;p=thirdparty%2Ftvheadend.git

Makefile: Simplify (and probably fix) the ffdecsa rules
---

diff --git a/Makefile b/Makefile
index 1347e5301..c3ad89c2e 100644
--- a/Makefile
+++ b/Makefile
@@ -287,22 +287,18 @@ SRCS-${CONFIG_CAPMT} += \
 
 # FFdecsa
 ifneq ($(CONFIG_DVBCSA),yes)
-ifeq ($(CONFIG_CWC),yes)
-SRCS-yes += src/descrambler/ffdecsa/ffdecsa_interface.c \
-	    src/descrambler/ffdecsa/ffdecsa_int.c
-SRCS-${CONFIG_MMX}  += src/descrambler/ffdecsa/ffdecsa_mmx.c
-SRCS-${CONFIG_SSE2} += src/descrambler/ffdecsa/ffdecsa_sse2.c
-else
-ifeq ($(CONFIG_CAPMT),yes)
+FFDECSA-$(CONFIG_CAPMT) = yes
+FFDECSA-$(CONFIG_CWC)   = yes
+endif
+
+ifeq ($(FFDECSA-yes),yes)
 SRCS-yes += src/descrambler/ffdecsa/ffdecsa_interface.c \
 	    src/descrambler/ffdecsa/ffdecsa_int.c
 SRCS-${CONFIG_MMX}  += src/descrambler/ffdecsa/ffdecsa_mmx.c
 SRCS-${CONFIG_SSE2} += src/descrambler/ffdecsa/ffdecsa_sse2.c
-endif
 ${BUILDDIR}/src/descrambler/ffdecsa/ffdecsa_mmx.o  : CFLAGS += -mmmx
 ${BUILDDIR}/src/descrambler/ffdecsa/ffdecsa_sse2.o : CFLAGS += -msse2
 endif
-endif
 
 # File bundles
 SRCS-${CONFIG_BUNDLE}     += bundle.c