Mercurial > mplayer.hg

diff Makefile @ 34439:9441cb91bddd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Put test-related code in Makefile under ifdef FATE_SAMPLES. Hopefully fixes the compile issues a lot of people experienced (though I could not reproduce).
author reimar
date Sun, 08 Jan 2012 09:25:45 +0000
parents 8034d7f74800
children 4496c52ff7f1
line wrap: on
line diff
--- a/Makefile	Fri Jan 06 00:18:56 2012 +0000
+++ b/Makefile	Sun Jan 08 09:25:45 2012 +0000
@@ -998,6 +998,8 @@
     qt-surge-suite/% real/ra% sipr/% truespeech/% vorbis/%         \
     vqf/% w64/% wmapro/% wmavoice/%                                \
 
+# running wildcard with empty FATE_SAMPLES seems to cause a lot of issues
+ifdef FATE_SAMPLES
 ALLSAMPLES_FULLPATH = $(wildcard $(FATE_SAMPLES)/*/*.*)
 ALLSAMPLES          = $(patsubst $(FATE_SAMPLES)/%,%,$(ALLSAMPLES_FULLPATH))
 SAMPLES := $(filter-out $(BROKEN_SAMPLES),$(ALLSAMPLES))
@@ -1008,6 +1010,7 @@
 
 tests/res/%.md5: mplayer$(EXESUF) $(FATE_SAMPLES)/%
 	@tests/faterun.sh $*
+endif