aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-04-14 21:39:56 +0000
committerDiego Biurrun <diego@biurrun.de>2008-04-14 21:39:56 +0000
commit16507ddd6b0eee407b6e2c37e91c8af4be0d2370 (patch)
tree3715e329bf4b94c416733732547b2f9e77997442
parent3fbe711832625b82d2cea5a3397f0167f893fdc7 (diff)
downloadffmpeg-16507ddd6b0eee407b6e2c37e91c8af4be0d2370.tar.gz
Add DIRS variable to the list of variables to be cleared instead of
unsetting it manually. Originally committed as revision 12825 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Makefile2
-rw-r--r--common.mak3
2 files changed, 1 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index e64264e1a5..878f17f558 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
cp -p $< $@
$(STRIP) $@
-SUBDIR_VARS := OBJS ASM_OBJS CPP_OBJS FFLIBS CLEANFILES
+SUBDIR_VARS := OBJS ASM_OBJS CPP_OBJS FFLIBS CLEANFILES DIRS
define RESET
$(1) :=
diff --git a/common.mak b/common.mak
index 1fbdf2b489..2ec0dffd13 100644
--- a/common.mak
+++ b/common.mak
@@ -87,9 +87,6 @@ endef
$(eval $(RULES))
-# Clear DIRS variable so that it is not used in other subdirectories.
-DIRS =
-
tests: $(TESTS)
-include $(DEPS)