Mercurial > mplayer.hg

changeset 21080:618d1857f4c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Unify dep/depend targets.
author diego
date Mon, 20 Nov 2006 11:18:01 +0000
parents a09d28771d0c
children 8e6ca907cf55
files Gui/Makefile Makefile TOOLS/netstream/Makefile drivers/Makefile drivers/radeon/Makefile dvdread/Makefile input/Makefile liba52/Makefile libaf/Makefile libao2/Makefile libass/Makefile libdha/Makefile libdha/kernelhelper/Makefile libdvdcss/Makefile libfaad2/Makefile libmenu/Makefile libmpcodecs/Makefile libmpdemux/Makefile libmpeg2/Makefile libvo/Makefile loader/dmo/Makefile loader/dshow/Makefile mp3lib/Makefile osdep/Makefile stream/Makefile tremor/Makefile vidix/Makefile vidix/drivers/Makefile
diffstat 28 files changed, 30 insertions(+), 82 deletions(-) [+]
line wrap: on
line diff
--- a/Gui/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/Gui/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -70,18 +70,14 @@
               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
 
 #
--- a/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -410,9 +410,7 @@
 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
 
--- a/TOOLS/netstream/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/TOOLS/netstream/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -49,9 +49,7 @@
 distclean: clean
 	rm -f .depend test
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) test.c $(SRCS) 1>.depend
 
 #
--- a/drivers/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/drivers/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -46,7 +46,7 @@
 endif
 	depmod -a
 
-dep:
+dep depend:
 
 clean: 
 	rm -f *.o *.a *~
--- a/drivers/radeon/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/drivers/radeon/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -27,7 +27,7 @@
 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 *~
--- a/dvdread/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/dvdread/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -40,9 +40,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
--- a/input/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/input/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -33,9 +33,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
--- a/liba52/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/liba52/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -40,9 +40,7 @@
 distclean: clean
 	rm -f .depend test
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
--- a/libaf/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/libaf/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -68,9 +68,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
--- a/libao2/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/libao2/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -31,9 +31,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
--- a/libass/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/libass/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -33,9 +33,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
--- a/libdha/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/libdha/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -76,9 +76,7 @@
 	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:
--- a/libdha/kernelhelper/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/libdha/kernelhelper/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -17,7 +17,7 @@
 	install -m 644 dhahelper.o $(MDIR)/dhahelper.o
 	depmod -a
 
-dep:
+dep depend:
 
 clean: 
 	rm -f *.o *~
--- a/libdvdcss/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/libdvdcss/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -43,9 +43,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
--- a/libfaad2/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/libfaad2/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -71,9 +71,7 @@
 distclean: clean
 	rm -f .depend test
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
--- a/libmenu/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/libmenu/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -38,9 +38,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
--- a/libmpcodecs/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/libmpcodecs/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -339,9 +339,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) $(SRCS2) 1>.depend
 
 #
--- a/libmpdemux/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/libmpdemux/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -132,9 +132,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
--- a/libmpeg2/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/libmpeg2/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -51,9 +51,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
--- a/libvo/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/libvo/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -66,9 +66,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
--- a/loader/dmo/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/loader/dmo/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -36,9 +36,7 @@
 distclean: clean
 	rm -f .depend test test.raw
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
--- a/loader/dshow/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/loader/dshow/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -41,9 +41,7 @@
 distclean: clean
 	rm -f .depend test test.raw
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
--- a/mp3lib/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/mp3lib/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -66,9 +66,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
--- a/osdep/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/osdep/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -57,9 +57,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
--- a/stream/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/stream/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -156,9 +156,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
--- a/tremor/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/tremor/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -41,9 +41,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #
--- a/vidix/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/vidix/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -31,11 +31,9 @@
 	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
--- a/vidix/drivers/Makefile	Mon Nov 20 11:14:11 2006 +0000
+++ b/vidix/drivers/Makefile	Mon Nov 20 11:18:01 2006 +0000
@@ -64,9 +64,7 @@
 distclean: clean
 	rm -f .depend test
 
-dep:    depend
-
-depend:
+dep depend:
 # do nothing here
 
 install: