From 1b2bc3597df52469fbd71e3f563b1f063f11b42b Mon Sep 17 00:00:00 2001
From: rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 2 Apr 2006 03:22:32 +0000
Subject: integrate old "libdeps" hack into makefile

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18014 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile     | 41 ++++++++++++++++++++++++++++++++++++-----
 etc/.libdeps | 31 -------------------------------
 2 files changed, 36 insertions(+), 36 deletions(-)
 delete mode 100644 etc/.libdeps

diff --git a/Makefile b/Makefile
index 66fc34cf5f..7ad5e52810 100644
--- a/Makefile
+++ b/Makefile
@@ -568,12 +568,43 @@ endif
 version.h: config.h config.mak Makefile
 
 #
-# include dependencies to get make to recurse into lib dirs,
-# if the user desires such behavior
+# the following lines provide _partial_ dependency information
+# for the 'library' directories under main dir, in order to cause
+# the build process to recursively descend into them if something
+# has changed. ideally this will be replaced with a single
+# nonrecursive makefile for the whole project.
 #
-ifneq ($(wildcard .libdeps),)
-include .libdeps
-endif
+
+libvo/libvo.a: $(wildcard libvo/*.[ch])
+libao2/libao2.a: $(wildcard libao2/*.[ch])
+osdep/libosdep.a: $(wildcard osdep/*.[ch])
+input/libinput.a: $(wildcard input/*.[ch])
+
+libmenu/libmenu.a: $(wildcard libmenu/*.[ch])
+libaf/libaf.a: $(wildcard libaf/*.[ch])
+libmpdvdkit2/libmpdvdkit.a libmpdvdkit2/libmpdvdkit.so: $(wildcard libmpdvdkit2/*.[ch])
+
+libmpdemux/libmpdemux.a: $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch])
+libmpcodecs/libmpcodecs.a: $(wildcard libmpcodecs/*.[ch])
+libmpcodecs/libmpencoders.a: $(wildcard libmpcodecs/*.[ch])
+
+libavutil/libavutil.a: $(wildcard libavutil/*.[ch])
+libavcodec/libavcodec.a: $(wildcard libavcodec/*.[ch] libavcodec/*/*.[chS])
+libavformat/libavformat.a: $(wildcard libavformat/*.[ch])
+postproc/libswscale.a: $(wildcard postproc/*.[ch])
+
+libmpeg2/libmpeg2.a: $(wildcard libmpeg2/*.[ch])
+liba52/liba52.a: $(wildcard liba52/*.[ch])
+mp3lib/libMP3.a: $(wildcard mp3lib/*.[ch])
+libfaad2/libfaad2.a: $(wildcard libfaad2/*.[ch] libfaad2/*/*.[ch])
+
+loader/libloader.a: $(wildcard loader/*.[chSs])
+loader/dmo/libDMO_Filter.a: $(wildcard loader/dmo/*.[ch])
+loader/dshow/libDS_Filter.a: $(wildcard loader/dshow/*.[ch])
+
+libdha/libdha.so: $(wildcard libdha/*.[ch])
+vidix/libvidix.a: $(wildcard vidix/*.[ch])
+Gui/libgui.a: $(wildcard Gui/*.[ch] Gui/*/*.[ch] Gui/*/*/*.[ch])
 
 #
 # include dependency files if they exist
diff --git a/etc/.libdeps b/etc/.libdeps
deleted file mode 100644
index 280f8fea6c..0000000000
--- a/etc/.libdeps
+++ /dev/null
@@ -1,31 +0,0 @@
-# If included in the main MPlayer Makefile, this file causes make to
-# recurse into subdirectories whenever any .c or .h files in those
-# directories have changed. Then the Makefile in that directory will
-# take over for detailed dependencies.
-
-libmpdvdkit/libmpdvdkit.a libmpdvdkit/libmpdvdkit.so: $(wildcard libmpdvdkit/*.[ch])
-libmpdvdkit2/libmpdvdkit.a libmpdvdkit2/libmpdvdkit.so: $(wildcard libmpdvdkit2/*.[ch])
-loader/libloader.a: $(wildcard loader/*.[chSs])
-loader/dmo/libDMO_Filter.a: $(wildcard loader/dmo/*.[ch])
-loader/dshow/libDS_Filter.a: $(wildcard loader/dshow/*.[ch])
-libfame/libfame.a: $(wildcard libfame/*.[ch])
-libmpdemux/libmpdemux.a: $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch])
-libmpcodecs/libmpcodecs.a: $(wildcard libmpcodecs/*.[ch])
-libaf/libaf.a: $(wildcard libaf/*.[ch])
-libmp1e/libmp1e.a: $(wildcard libmp1e/*.[ch])
-libavcodec/libavcodec.a: $(wildcard libavcodec/*.[ch] libavcodec/*/*.[chS])
-libmpeg2/libmpeg2.a: $(wildcard libmpeg2/*.[ch])
-libvo/libvo.a: $(wildcard libvo/*.[ch])
-libao2/libao2.a: $(wildcard libao2/*.[ch])
-liba52/liba52.a: $(wildcard liba52/*.[ch])
-mp3lib/libMP3.a: $(wildcard mp3lib/*.[ch])
-libdha/libdha.so: $(wildcard libdha/*.[ch])
-vidix/libvidix.a: $(wildcard vidix/*.[ch])
-Gui/libgui.a: $(wildcard Gui/*.[ch] Gui/*/*.[ch] Gui/*/*/*.[ch])
-postproc/libswscale.a: $(wildcard postproc/*.[ch])
-input/libinput.a: $(wildcard input/*.[ch])
-libfaad2/libfaad2.a: $(wildcard libfaad2/*.[ch] libfaad2/*/*.[ch])
-libavformat/libavformat.a: $(wildcard libavformat/*.[ch])
-libavutil/libavutil.a: $(wildcard libavutil/*.[ch])
-osdep/libosdep.a: $(wildcard osdep/*.[ch])
-libmenu/libmenu.a: $(wildcard libmenu/*.[ch])
-- 
cgit v1.2.3