summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2019-07-13 15:40:49 (GMT)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-08-12 12:03:37 (GMT)
commit3ccfafaa520247eeb72d7eeae047324de2fe7c32 (patch)
tree90677408ff40033f4ab1e2fa3d09f3ab4248744b
parent1c187978d479a2f941c9c4fb10d8b2612d5fde3c (diff)
downloaddtv-scan-tables-3ccfafaa520247eeb72d7eeae047324de2fe7c32.zip
dtv-scan-tables-3ccfafaa520247eeb72d7eeae047324de2fe7c32.tar.gz
dtv-scan-tables-3ccfafaa520247eeb72d7eeae047324de2fe7c32.tar.bz2
Improve Makefile to avoid "Argument list too long" error
I wouldn't expect a foreach loop to be prone to this issue but it's not the right way to write a Makefile anyway. Note that conversion failures are now fatal and the dvb-t/ke-Nairobi file is failing to convert at the moment. Signed-off-by: James Le Cuirot <chewi@gentoo.org> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--Makefile16
1 files changed, 10 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 901dc9d..7cdb5bc 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,8 @@ DVBV3DIRS = atsc dvb-c dvb-s dvb-t
DVBV5DIRS = $(DVBV3DIRS) isdb-t
DVBV3CHANNELFILES = $(foreach dir,$(DVBV3DIRS),$(wildcard $(dir)/*))
+DVBV3OUTPUTFILES = $(patsubst %,$(DVBV3OUTPUTDIR)/%,$(DVBV3CHANNELFILES))
+DVBV5OUTPUTFILES = $(patsubst %,$(DVBV5OUTPUTDIR)/%,$(DVBV3CHANNELFILES))
DVBFORMATCONVERT_CHANNEL_DVBV5 = -ICHANNEL -ODVBV5
DVBFORMATCONVERT_CHANNEL_DVBV3 = -IDVBV5 -OCHANNEL
@@ -42,14 +44,16 @@ ifeq ($(DVBV3DIR),)
DVBV3DIR = dvbv3
endif
-dvbv3:
- @$(foreach var,$(DVBV3DIRS), $(MKDIR) $(DVBV3OUTPUTDIR)/$(var);)
- @$(foreach var,$(DVBV3CHANNELFILES), $(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV3) $(var) $(DVBV3OUTPUTDIR)/$(var);)
+$(DVBV3OUTPUTFILES): $(DVBV3OUTPUTDIR)/%: %
+ @$(MKDIR) "$(dir $@)"
+ @$(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV3) "$<" "$@"
+$(DVBV5OUTPUTFILES): $(DVBV5OUTPUTDIR)/%: $(DVBV3OUTPUTDIR)/%
+ @$(MKDIR) "$(dir $@)"
+ @$(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV5) "$<" "$@"
-dvbv5: $(DVBV3OUTPUTDIR)
- @$(foreach var,$(DVBV3DIRS), $(MKDIR) $(DVBV5OUTPUTDIR)/$(var);)
- @$(foreach var,$(DVBV3CHANNELFILES), $(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV5) $(DVBV3OUTPUTDIR)/$(var) $(DVBV5OUTPUTDIR)/$(var);)
+dvbv3: $(DVBV3OUTPUTFILES)
+dvbv5: $(DVBV5OUTPUTFILES)
install:
@mkdir -p $(DATADIR)/$(DVBV5DIR)