summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-24 17:41:19 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-24 17:41:19 +0000
commitb5653b5698b468d2f5528979e331ec21eb868562 (patch)
tree61f6ab6ff790369013f09ab2822b93bbeb0e80e4
parent1b7adb682202d310cff714b355164a2b29c877c6 (diff)
downloadmpv-b5653b5698b468d2f5528979e331ec21eb868562.tar.bz2
mpv-b5653b5698b468d2f5528979e331ec21eb868562.tar.xz
Include mpcommon.mak before declaring dependencies, which require mpcommon.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26520 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1df6c6cfd2..cc9450470f 100644
--- a/Makefile
+++ b/Makefile
@@ -489,13 +489,16 @@ all: recurse $(ALL_PRG)
recurse:
for part in $(PARTS); do $(MAKE) -C $$part; done
+# Hack to keep .depend from being generated at the top level unnecessarily.
+DEPS = foo
+
+include mpcommon.mak
+
DEPS = $(SRCS_COMMON:.c=.d) $(SRCS_MPLAYER:.c=.d) $(SRCS_MENCODER:.c=.d)
$(DEPS) recurse: help_mp.h version.h codecs.conf.h
dep depend: $(DEPS)
for part in $(PARTS); do $(MAKE) -C $$part .depend; done
-include mpcommon.mak
-
CFLAGS := $(subst -I..,-I.,$(CFLAGS))
define RECURSIVE_RULE