changeset 26549:3cce5bfc52c0

Remove code for .depend generation, inclusion and related hacks.
author diego
date Mon, 28 Apr 2008 15:42:36 +0000
parents 04749d95b43d
children 8a26190978a6
files Makefile mpcommon.mak
diffstat 2 files changed, 1 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Apr 28 15:41:30 2008 +0000
+++ b/Makefile	Mon Apr 28 15:42:36 2008 +0000
@@ -678,9 +678,6 @@
 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))))
--- a/mpcommon.mak	Mon Apr 28 15:41:30 2008 +0000
+++ b/mpcommon.mak	Mon Apr 28 15:42:36 2008 +0000
@@ -27,10 +27,7 @@
 	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 @@
 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