]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
Makefile: fix --disable-dvbscan, fixes #4935
authorJaroslav Kysela <perex@perex.cz>
Tue, 13 Feb 2018 10:00:30 +0000 (11:00 +0100)
committerJaroslav Kysela <perex@perex.cz>
Tue, 13 Feb 2018 10:18:16 +0000 (11:18 +0100)
Makefile

index a9763ea91f883f48744759ada241bc0b68f0e9d8..d511e83fa8c78e75e31d6cd24d42afcae363c795 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -631,13 +631,16 @@ SRCS-${CONFIG_DBUS_1}  += src/dbus.c
 # Watchdog
 SRCS-${CONFIG_LIBSYSTEMD_DAEMON} += src/watchdog.c
 
+# DVB scan
+DVBSCAN-$(CONFIG_DVBSCAN) += check_dvb_scan
+ALL-$(CONFIG_DVBSCAN)     += check_dvb_scan
+
 # File bundles
 SRCS-${CONFIG_BUNDLE}     += bundle.c
 BUNDLES-yes               += src/webui/static
 BUNDLES-yes               += data/conf
 BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan
 BUNDLES                    = $(BUNDLES-yes)
-ALL-$(CONFIG_DVBSCAN)     += check_dvb_scan
 
 #
 # Documentation
@@ -831,7 +834,7 @@ $(BUILDDIR)/bundle.o: $(BUILDDIR)/bundle.c
        @mkdir -p $(dir $@)
        $(pCC) $(CFLAGS) -I${ROOTDIR}/src -c -o $@ $<
 
-$(BUILDDIR)/bundle.c: check_dvb_scan make_webui
+$(BUILDDIR)/bundle.c: $(DVBSCAN-yes) make_webui
        @mkdir -p $(dir $@)
        $(pMKBUNDLE) -o $@ -d ${BUILDDIR}/bundle.d $(BUNDLE_FLAGS) $(BUNDLES:%=$(ROOTDIR)/%)