# HG changeset patch # User diego # Date 1176275764 0 # Node ID 6613c5397aba3891615caaa93cdad6a599ba0896 # Parent 0f9bd35f971a4ced4acb0c866adaf2e078fedfc3 Remove the .norecurse hack. It bloats the Makefile, adds maintenance burden, likely has no users and most of all does not work correctly anyway. diff -r 0f9bd35f971a -r 6613c5397aba Makefile --- a/Makefile Wed Apr 11 05:39:09 2007 +0000 +++ b/Makefile Wed Apr 11 07:16:04 2007 +0000 @@ -359,55 +359,6 @@ # temporary measure to make sure help_mp.h is built. we desperately need correct deps! $(MPLAYER_DEPS) $(MENCODER_DEPS): help_mp.h -# -# 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. -# -# Now all directories are recursed by default because these rules do not -# consider dependencies on files in other directories, while the recursively -# invoked Makefiles do. Conditional recursion only to the directories with -# changed files can be enabled by creating a file named ".norecurse" and -# optionally giving it a timestamp in the past. Directories whose .a files -# are newer than the timestamp and newer than other files in the directory -# will not be recursed. -.norecurse: - -libvo/libvo.a: .norecurse $(wildcard libvo/*.[ch]) -libvo/libosd.a: .norecurse $(wildcard libvo/*.[ch]) -libao2/libao2.a: .norecurse $(wildcard libao2/*.[ch]) -osdep/libosdep.a: .norecurse $(wildcard osdep/*.[ch]) -input/libinput.a: .norecurse $(wildcard input/*.[ch]) - -libmenu/libmenu.a: .norecurse $(wildcard libmenu/*.[ch]) -libaf/libaf.a: .norecurse $(wildcard libaf/*.[ch]) -dvdread/libdvdread.a: .norecurse $(wildcard dvdread/*.[ch]) -libdvdcss/libdvdcss.a: .norecurse $(wildcard libdvdcss/*.[ch]) - -libmpdemux/libmpdemux.a: .norecurse $(wildcard libmpdemux/*.[ch]) -libmpdemux/libmpmux.a: .norecurse $(wildcard libmpdemux/*.[ch]) -stream/stream.a: .norecurse $(wildcard stream/*.[ch] stream/*/*.[ch]) -libmpcodecs/libmpcodecs.a: .norecurse $(wildcard libmpcodecs/*.[ch]) $(wildcard libmpcodecs/native/*.[ch]) -libmpcodecs/libmpencoders.a: .norecurse $(wildcard libmpcodecs/*.[ch]) - -libavutil/libavutil.a: .norecurse $(wildcard libavutil/*.[ch]) -libavcodec/libavcodec.a: .norecurse $(wildcard libavcodec/*.[ch] libavcodec/*/*.[chS]) -libavformat/libavformat.a: .norecurse $(wildcard libavformat/*.[ch]) -libswscale/libswscale.a: .norecurse $(wildcard libswscale/*.[ch]) - -libmpeg2/libmpeg2.a: .norecurse $(wildcard libmpeg2/*.[ch]) -liba52/liba52.a: .norecurse $(wildcard liba52/*.[ch]) -mp3lib/libmp3.a: .norecurse $(wildcard mp3lib/*.[ch]) -libfaad2/libfaad2.a: .norecurse $(wildcard libfaad2/*.[ch] libfaad2/*/*.[ch]) - -loader/libloader.a: .norecurse $(wildcard loader/*.[chSs]) -vidix/libvidix.a: .norecurse $(wildcard vidix/*.[ch]) -Gui/libgui.a: .norecurse $(wildcard Gui/*.[ch] Gui/*/*.[ch] Gui/*/*/*.[ch]) - -libass/libass.a: .norecurse $(wildcard libass/*.[ch]) - -include .depend .PHONY: all install* uninstall clean distclean strip dep depend