summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-28 11:22:25 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-28 11:22:25 +0000
commitdf22d5fd5dde9d1f75f0ba41987e833996509ba6 (patch)
tree2c0776c7807f868914e617876eeaeca46e3e0341
parentcaca5212961ac3be3a05e8e37a637b3a86a69f7e (diff)
downloadmpv-df22d5fd5dde9d1f75f0ba41987e833996509ba6.tar.bz2
mpv-df22d5fd5dde9d1f75f0ba41987e833996509ba6.tar.xz
Make OBJS depend on the recurse target instead of just the all target.
This fixes 'make mplayer' and 'make mencoder'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26557 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index cde5354325..f4937b0982 100644
--- a/Makefile
+++ b/Makefile
@@ -647,7 +647,7 @@ DIRS = dvdread \
TOOLS \
vidix \
-all: recurse $(ALL_PRG)
+all: $(ALL_PRG)
recurse:
for part in $(PARTS); do $(MAKE) -C $$part; done
@@ -671,6 +671,8 @@ endef
$(foreach part,$(PARTS),$(eval $(RECURSIVE_RULE)))
+$(OBJS): recurse
+
mplayer$(EXESUF): $(MPLAYER_DEPS)
$(CC) -o $@ $^ $(LDFLAGS_MPLAYER)