From cf4bf03dc27fd6a499fd1e2b23bce2c1093ad2d1 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 20 Nov 2006 11:18:01 +0000 Subject: Unify dep/depend targets. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21096 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/Makefile | 8 ++------ Makefile | 4 +--- TOOLS/netstream/Makefile | 4 +--- drivers/Makefile | 2 +- drivers/radeon/Makefile | 2 +- dvdread/Makefile | 4 +--- input/Makefile | 4 +--- liba52/Makefile | 4 +--- libaf/Makefile | 4 +--- libao2/Makefile | 4 +--- libass/Makefile | 4 +--- libdha/Makefile | 4 +--- libdha/kernelhelper/Makefile | 2 +- libdvdcss/Makefile | 4 +--- libfaad2/Makefile | 4 +--- libmenu/Makefile | 4 +--- libmpcodecs/Makefile | 4 +--- libmpdemux/Makefile | 4 +--- libmpeg2/Makefile | 4 +--- libvo/Makefile | 4 +--- loader/dmo/Makefile | 4 +--- loader/dshow/Makefile | 4 +--- mp3lib/Makefile | 4 +--- osdep/Makefile | 4 +--- stream/Makefile | 4 +--- tremor/Makefile | 4 +--- vidix/Makefile | 6 ++---- vidix/drivers/Makefile | 4 +--- 28 files changed, 30 insertions(+), 82 deletions(-) diff --git a/Gui/Makefile b/Gui/Makefile index 4cc7365517..2ef1174f9b 100644 --- a/Gui/Makefile +++ b/Gui/Makefile @@ -70,18 +70,14 @@ clean: wm/*.o wm/*~ \ win32/*.o win32/*~ \ -#dep: depend -# -#depend: +#dep depend: # makedepend -- $(CFLAGS) -- $(SRCS) &>/dev/null # distclean: clean rm -f .depend -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/Makefile b/Makefile index c1b9edcfc7..4e21dcf3c6 100644 --- a/Makefile +++ b/Makefile @@ -410,9 +410,7 @@ distclean: dirclean doxygen_clean strip: strip -s $(ALL_PRG) -dep: depend - -depend: help_mp.h version.h +dep depend: help_mp.h version.h $(CC) -MM $(CFLAGS) -DCODECS2HTML mplayer.c mencoder.c $(SRCS_MPLAYER) $(SRCS_MENCODER) 1>.depend @for a in $(PARTS); do $(MAKE) -C $$a dep; done diff --git a/TOOLS/netstream/Makefile b/TOOLS/netstream/Makefile index 27996d2383..c9d42605e1 100644 --- a/TOOLS/netstream/Makefile +++ b/TOOLS/netstream/Makefile @@ -49,9 +49,7 @@ clean: distclean: clean rm -f .depend test -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) test.c $(SRCS) 1>.depend # diff --git a/drivers/Makefile b/drivers/Makefile index 9abc7f4edf..7cc6b54820 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -46,7 +46,7 @@ else endif depmod -a -dep: +dep depend: clean: rm -f *.o *.a *~ diff --git a/drivers/radeon/Makefile b/drivers/radeon/Makefile index 7b0bfc15a7..cef937db5c 100644 --- a/drivers/radeon/Makefile +++ b/drivers/radeon/Makefile @@ -27,7 +27,7 @@ radeon_vid.o: radeon_vid.c radeon.h radeon_vid.h rage128_vid.o: radeon_vid.c radeon.h radeon_vid.h $(CC) $(CFLAGS) -DRAGE128 $(INCLUDES) -c radeon_vid.c -o $@ -dep: +dep depend: clean: rm -f *.o *.a *~ diff --git a/dvdread/Makefile b/dvdread/Makefile index e2bd110028..56a0f62739 100644 --- a/dvdread/Makefile +++ b/dvdread/Makefile @@ -40,9 +40,7 @@ clean: distclean: clean rm -f .depend -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/input/Makefile b/input/Makefile index f829b883bf..ed052ff51c 100644 --- a/input/Makefile +++ b/input/Makefile @@ -33,9 +33,7 @@ clean: distclean: clean rm -f .depend -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/liba52/Makefile b/liba52/Makefile index 44b8b3e714..485d57c76d 100644 --- a/liba52/Makefile +++ b/liba52/Makefile @@ -40,9 +40,7 @@ clean: distclean: clean rm -f .depend test -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/libaf/Makefile b/libaf/Makefile index 91417bd3ef..6f7b4b5c0b 100644 --- a/libaf/Makefile +++ b/libaf/Makefile @@ -68,9 +68,7 @@ clean: distclean: clean rm -f .depend -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/libao2/Makefile b/libao2/Makefile index 90bbb6cad0..a0d5eea933 100644 --- a/libao2/Makefile +++ b/libao2/Makefile @@ -31,9 +31,7 @@ clean: distclean: clean rm -f .depend -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/libass/Makefile b/libass/Makefile index aeadd52153..8260093c4f 100644 --- a/libass/Makefile +++ b/libass/Makefile @@ -33,9 +33,7 @@ clean: distclean: clean rm -f .depend -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/libdha/Makefile b/libdha/Makefile index ad7e1f9be9..4363270795 100644 --- a/libdha/Makefile +++ b/libdha/Makefile @@ -76,9 +76,7 @@ distclean: clean rm -f .depend test rm -f pci_dev_ids.c pci_ids.h pci_names.c pci_names.h pci_vendors.h pci.db -dep: depend - -depend: pci_names.c +dep depend: pci_names.c $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend install: diff --git a/libdha/kernelhelper/Makefile b/libdha/kernelhelper/Makefile index 4afd530fb2..7349718949 100644 --- a/libdha/kernelhelper/Makefile +++ b/libdha/kernelhelper/Makefile @@ -17,7 +17,7 @@ install: dhahelper.o install -m 644 dhahelper.o $(MDIR)/dhahelper.o depmod -a -dep: +dep depend: clean: rm -f *.o *~ diff --git a/libdvdcss/Makefile b/libdvdcss/Makefile index d8c9ecb4e0..50fc0a3837 100644 --- a/libdvdcss/Makefile +++ b/libdvdcss/Makefile @@ -43,9 +43,7 @@ clean: distclean: clean rm -f .depend -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/libfaad2/Makefile b/libfaad2/Makefile index 2e9e267c05..619d76274d 100644 --- a/libfaad2/Makefile +++ b/libfaad2/Makefile @@ -71,9 +71,7 @@ clean: distclean: clean rm -f .depend test -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/libmenu/Makefile b/libmenu/Makefile index 3c50a754ff..8d6df80695 100644 --- a/libmenu/Makefile +++ b/libmenu/Makefile @@ -38,9 +38,7 @@ clean: distclean: clean rm -f .depend -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index 756edbe878..c016c85894 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -339,9 +339,7 @@ clean: distclean: clean rm -f .depend -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) $(SRCS2) 1>.depend # diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index d7d6e5074e..7af5118a00 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -132,9 +132,7 @@ clean: distclean: clean rm -f .depend -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/libmpeg2/Makefile b/libmpeg2/Makefile index 5448d81796..ee0b327531 100644 --- a/libmpeg2/Makefile +++ b/libmpeg2/Makefile @@ -51,9 +51,7 @@ clean: distclean: clean rm -f .depend -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/libvo/Makefile b/libvo/Makefile index 76216a97a4..868c37da3e 100644 --- a/libvo/Makefile +++ b/libvo/Makefile @@ -66,9 +66,7 @@ clean: distclean: clean rm -f .depend -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/loader/dmo/Makefile b/loader/dmo/Makefile index c266ca953e..4a2528fa24 100644 --- a/loader/dmo/Makefile +++ b/loader/dmo/Makefile @@ -36,9 +36,7 @@ clean: distclean: clean rm -f .depend test test.raw -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/loader/dshow/Makefile b/loader/dshow/Makefile index 4492ba2a85..b532e09fc4 100644 --- a/loader/dshow/Makefile +++ b/loader/dshow/Makefile @@ -41,9 +41,7 @@ clean: distclean: clean rm -f .depend test test.raw -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/mp3lib/Makefile b/mp3lib/Makefile index 2889e9c72f..8bb338fab9 100644 --- a/mp3lib/Makefile +++ b/mp3lib/Makefile @@ -66,9 +66,7 @@ clean: distclean: clean rm -f .depend -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/osdep/Makefile b/osdep/Makefile index 0d8e471b66..a5ee59201e 100644 --- a/osdep/Makefile +++ b/osdep/Makefile @@ -57,9 +57,7 @@ clean: distclean: clean rm -f .depend -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/stream/Makefile b/stream/Makefile index 8d03ded1ba..cf97b85224 100644 --- a/stream/Makefile +++ b/stream/Makefile @@ -156,9 +156,7 @@ clean: distclean: clean rm -f .depend -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/tremor/Makefile b/tremor/Makefile index 8d04e2f50f..f7f9a5abb1 100644 --- a/tremor/Makefile +++ b/tremor/Makefile @@ -41,9 +41,7 @@ clean: distclean: clean rm -f .depend -dep: depend - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # diff --git a/vidix/Makefile b/vidix/Makefile index 65da0a0ed5..4b203be805 100644 --- a/vidix/Makefile +++ b/vidix/Makefile @@ -31,11 +31,9 @@ distclean: clean rm -f .depend test $(MAKE) -C drivers distclean -dep: depend - $(MAKE) -C drivers dep - -depend: +dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend + $(MAKE) -C drivers depend install: $(MAKE) -C drivers install diff --git a/vidix/drivers/Makefile b/vidix/drivers/Makefile index 831587b071..deeaec6093 100644 --- a/vidix/drivers/Makefile +++ b/vidix/drivers/Makefile @@ -64,9 +64,7 @@ clean: distclean: clean rm -f .depend test -dep: depend - -depend: +dep depend: # do nothing here install: -- cgit v1.2.3