[MPlayer-cvslog] r21096 - in trunk: 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

diego subversion at mplayerhq.hu
Mon Nov 20 12:18:02 CET 2006


Author: diego
Date: Mon Nov 20 12:18:01 2006
New Revision: 21096

Modified:
   trunk/Gui/Makefile
   trunk/Makefile
   trunk/TOOLS/netstream/Makefile
   trunk/drivers/Makefile
   trunk/drivers/radeon/Makefile
   trunk/dvdread/Makefile
   trunk/input/Makefile
   trunk/liba52/Makefile
   trunk/libaf/Makefile
   trunk/libao2/Makefile
   trunk/libass/Makefile
   trunk/libdha/Makefile
   trunk/libdha/kernelhelper/Makefile
   trunk/libdvdcss/Makefile
   trunk/libfaad2/Makefile
   trunk/libmenu/Makefile
   trunk/libmpcodecs/Makefile
   trunk/libmpdemux/Makefile
   trunk/libmpeg2/Makefile
   trunk/libvo/Makefile
   trunk/loader/dmo/Makefile
   trunk/loader/dshow/Makefile
   trunk/mp3lib/Makefile
   trunk/osdep/Makefile
   trunk/stream/Makefile
   trunk/tremor/Makefile
   trunk/vidix/Makefile
   trunk/vidix/drivers/Makefile

Log:
Unify dep/depend targets.


Modified: trunk/Gui/Makefile
==============================================================================
--- trunk/Gui/Makefile	(original)
+++ trunk/Gui/Makefile	Mon Nov 20 12:18:01 2006
@@ -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
 
 #

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Nov 20 12:18:01 2006
@@ -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
 

Modified: trunk/TOOLS/netstream/Makefile
==============================================================================
--- trunk/TOOLS/netstream/Makefile	(original)
+++ trunk/TOOLS/netstream/Makefile	Mon Nov 20 12:18:01 2006
@@ -49,9 +49,7 @@
 distclean: clean
 	rm -f .depend test
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) test.c $(SRCS) 1>.depend
 
 #

Modified: trunk/drivers/Makefile
==============================================================================
--- trunk/drivers/Makefile	(original)
+++ trunk/drivers/Makefile	Mon Nov 20 12:18:01 2006
@@ -46,7 +46,7 @@
 endif
 	depmod -a
 
-dep:
+dep depend:
 
 clean: 
 	rm -f *.o *.a *~

Modified: trunk/drivers/radeon/Makefile
==============================================================================
--- trunk/drivers/radeon/Makefile	(original)
+++ trunk/drivers/radeon/Makefile	Mon Nov 20 12:18:01 2006
@@ -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 *~

Modified: trunk/dvdread/Makefile
==============================================================================
--- trunk/dvdread/Makefile	(original)
+++ trunk/dvdread/Makefile	Mon Nov 20 12:18:01 2006
@@ -40,9 +40,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #

Modified: trunk/input/Makefile
==============================================================================
--- trunk/input/Makefile	(original)
+++ trunk/input/Makefile	Mon Nov 20 12:18:01 2006
@@ -33,9 +33,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #

Modified: trunk/liba52/Makefile
==============================================================================
--- trunk/liba52/Makefile	(original)
+++ trunk/liba52/Makefile	Mon Nov 20 12:18:01 2006
@@ -40,9 +40,7 @@
 distclean: clean
 	rm -f .depend test
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #

Modified: trunk/libaf/Makefile
==============================================================================
--- trunk/libaf/Makefile	(original)
+++ trunk/libaf/Makefile	Mon Nov 20 12:18:01 2006
@@ -68,9 +68,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #

Modified: trunk/libao2/Makefile
==============================================================================
--- trunk/libao2/Makefile	(original)
+++ trunk/libao2/Makefile	Mon Nov 20 12:18:01 2006
@@ -31,9 +31,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #

Modified: trunk/libass/Makefile
==============================================================================
--- trunk/libass/Makefile	(original)
+++ trunk/libass/Makefile	Mon Nov 20 12:18:01 2006
@@ -33,9 +33,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #

Modified: trunk/libdha/Makefile
==============================================================================
--- trunk/libdha/Makefile	(original)
+++ trunk/libdha/Makefile	Mon Nov 20 12:18:01 2006
@@ -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:

Modified: trunk/libdha/kernelhelper/Makefile
==============================================================================
--- trunk/libdha/kernelhelper/Makefile	(original)
+++ trunk/libdha/kernelhelper/Makefile	Mon Nov 20 12:18:01 2006
@@ -17,7 +17,7 @@
 	install -m 644 dhahelper.o $(MDIR)/dhahelper.o
 	depmod -a
 
-dep:
+dep depend:
 
 clean: 
 	rm -f *.o *~

Modified: trunk/libdvdcss/Makefile
==============================================================================
--- trunk/libdvdcss/Makefile	(original)
+++ trunk/libdvdcss/Makefile	Mon Nov 20 12:18:01 2006
@@ -43,9 +43,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #

Modified: trunk/libfaad2/Makefile
==============================================================================
--- trunk/libfaad2/Makefile	(original)
+++ trunk/libfaad2/Makefile	Mon Nov 20 12:18:01 2006
@@ -71,9 +71,7 @@
 distclean: clean
 	rm -f .depend test
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #

Modified: trunk/libmenu/Makefile
==============================================================================
--- trunk/libmenu/Makefile	(original)
+++ trunk/libmenu/Makefile	Mon Nov 20 12:18:01 2006
@@ -38,9 +38,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #

Modified: trunk/libmpcodecs/Makefile
==============================================================================
--- trunk/libmpcodecs/Makefile	(original)
+++ trunk/libmpcodecs/Makefile	Mon Nov 20 12:18:01 2006
@@ -339,9 +339,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) $(SRCS2) 1>.depend
 
 #

Modified: trunk/libmpdemux/Makefile
==============================================================================
--- trunk/libmpdemux/Makefile	(original)
+++ trunk/libmpdemux/Makefile	Mon Nov 20 12:18:01 2006
@@ -132,9 +132,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #

Modified: trunk/libmpeg2/Makefile
==============================================================================
--- trunk/libmpeg2/Makefile	(original)
+++ trunk/libmpeg2/Makefile	Mon Nov 20 12:18:01 2006
@@ -51,9 +51,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #

Modified: trunk/libvo/Makefile
==============================================================================
--- trunk/libvo/Makefile	(original)
+++ trunk/libvo/Makefile	Mon Nov 20 12:18:01 2006
@@ -66,9 +66,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #

Modified: trunk/loader/dmo/Makefile
==============================================================================
--- trunk/loader/dmo/Makefile	(original)
+++ trunk/loader/dmo/Makefile	Mon Nov 20 12:18:01 2006
@@ -36,9 +36,7 @@
 distclean: clean
 	rm -f .depend test test.raw
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #

Modified: trunk/loader/dshow/Makefile
==============================================================================
--- trunk/loader/dshow/Makefile	(original)
+++ trunk/loader/dshow/Makefile	Mon Nov 20 12:18:01 2006
@@ -41,9 +41,7 @@
 distclean: clean
 	rm -f .depend test test.raw
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #

Modified: trunk/mp3lib/Makefile
==============================================================================
--- trunk/mp3lib/Makefile	(original)
+++ trunk/mp3lib/Makefile	Mon Nov 20 12:18:01 2006
@@ -66,9 +66,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #

Modified: trunk/osdep/Makefile
==============================================================================
--- trunk/osdep/Makefile	(original)
+++ trunk/osdep/Makefile	Mon Nov 20 12:18:01 2006
@@ -57,9 +57,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #

Modified: trunk/stream/Makefile
==============================================================================
--- trunk/stream/Makefile	(original)
+++ trunk/stream/Makefile	Mon Nov 20 12:18:01 2006
@@ -156,9 +156,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #

Modified: trunk/tremor/Makefile
==============================================================================
--- trunk/tremor/Makefile	(original)
+++ trunk/tremor/Makefile	Mon Nov 20 12:18:01 2006
@@ -41,9 +41,7 @@
 distclean: clean
 	rm -f .depend
 
-dep:    depend
-
-depend:
+dep depend:
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 #

Modified: trunk/vidix/Makefile
==============================================================================
--- trunk/vidix/Makefile	(original)
+++ trunk/vidix/Makefile	Mon Nov 20 12:18:01 2006
@@ -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

Modified: trunk/vidix/drivers/Makefile
==============================================================================
--- trunk/vidix/drivers/Makefile	(original)
+++ trunk/vidix/drivers/Makefile	Mon Nov 20 12:18:01 2006
@@ -64,9 +64,7 @@
 distclean: clean
 	rm -f .depend test
 
-dep:    depend
-
-depend:
+dep depend:
 # do nothing here
 
 install:



More information about the MPlayer-cvslog mailing list