summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-28 15:42:36 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-28 15:42:36 +0000
commitd4f42c4d4629ba19c1f308ebb72fb92680668504 (patch)
tree10035cd0858ec41f542b3ea3027c353782de359f
parentd73a7beb004e9195abc5cf1dab1bf542ddb01e08 (diff)
downloadmpv-d4f42c4d4629ba19c1f308ebb72fb92680668504.tar.bz2
mpv-d4f42c4d4629ba19c1f308ebb72fb92680668504.tar.xz
Remove code for .depend generation, inclusion and related hacks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26581 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile3
-rw-r--r--mpcommon.mak11
2 files changed, 1 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index e922cb7f0b..d9883805dc 100644
--- a/Makefile
+++ b/Makefile
@@ -678,9 +678,6 @@ all: $(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 = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER))))
diff --git a/mpcommon.mak b/mpcommon.mak
index 342a3351d9..1809074495 100644
--- a/mpcommon.mak
+++ b/mpcommon.mak
@@ -27,10 +27,7 @@ clean::
rm -f *.o *.a *.ho *~
distclean:: clean
- rm -f *.d .depend test test2
-
-.depend: $(SRCS_COMMON) $(SRCS_MPLAYER) $(SRCS_MENCODER)
- $(MPDEPEND_CMD) > $@
+ rm -f *.d test test2
%.d: %.c
$(MPDEPEND_CMD) > $@
@@ -50,10 +47,4 @@ distclean:: clean
ALLHEADERS = $(wildcard *.h)
checkheaders: $(ALLHEADERS:.h=.ho)
-# Hack to keep .depend from being generated at the top level unnecessarily.
-ifndef DEPS
-DEPS = .depend
-endif
--include $(DEPS)
-
.PHONY: libs *clean dep depend