Makefile: Simplify (and probably fix) the ffdecsa rules

diff --git a/Makefile b/Makefile
index 1347e5301a6b57d7c2b82f3851815d9813271347..c3ad89c2e3b2457dafcaecba88792c465127c1b1 100644 (file)
--- 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