[MPlayer-cvslog] r26581 - in trunk: Makefile mpcommon.mak

[diego]

Author: diego
Date: Mon Apr 28 17:42:36 2008
New Revision: 26581

Log:
Remove code for .depend generation, inclusion and related hacks.


Modified:
   trunk/Makefile
   trunk/mpcommon.mak

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Apr 28 17:42:36 2008
@@ -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))))

Modified: trunk/mpcommon.mak
==============================================================================
--- trunk/mpcommon.mak	(original)
+++ trunk/mpcommon.mak	Mon Apr 28 17:42:36 2008
@@ -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