summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-04-13 10:37:30 +0000
committerDiego Biurrun <diego@biurrun.de>2008-04-13 10:37:30 +0000
commite825656f1df41da334b0be699cb1f3b5ec9b3ffb (patch)
tree89b7371fe3ec19e2205e7796a17c9d6be495016b
parent95d2afec0f458ecb4ee3181b28096b3a1fd5f135 (diff)
Clear DIRS variable in common.mak, so it does not have to be cleared in
each subdirectory Makefile. Originally committed as revision 12803 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--common.mak3
-rw-r--r--libavcodec/Makefile2
2 files changed, 3 insertions, 2 deletions
diff --git a/common.mak b/common.mak
index 2ec0dffd13..1fbdf2b489 100644
--- a/common.mak
+++ b/common.mak
@@ -87,6 +87,9 @@ endef
$(eval $(RULES))
+# Clear DIRS variable so that it is not used in other subdirectories.
+DIRS =
+
tests: $(TESTS)
-include $(DEPS)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 63b20789a4..a9858d79aa 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -472,8 +472,6 @@ DIRS = alpha armv4l bfin i386 mlib ppc ps2 sh4 sparc
include $(SUBDIR)../subdir.mak
-DIRS =
-
$(SUBDIR)cpuid-test$(EXESUF): $(SUBDIR)i386/cputest.c
$(SUBDIR)apiexample$(EXESUF): $(SUBDIR)apiexample.o $(SUBDIR)$(LIBNAME)
$(SUBDIR)dct-test$(EXESUF): $(SUBDIR)dct-test.o fdctref.o $(SUBDIR)$(LIBNAME)