summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--TOOLS/netstream/Makefile4
-rw-r--r--drivers/Makefile4
-rw-r--r--drivers/radeon/Makefile4
-rw-r--r--input/Makefile4
-rw-r--r--liba52/Makefile4
-rw-r--r--libaf/Makefile4
-rw-r--r--libao2/Makefile4
-rw-r--r--libdha/Makefile6
-rw-r--r--libfaad2/Makefile4
-rw-r--r--libmenu/Makefile4
-rw-r--r--libmpcodecs/Makefile4
-rw-r--r--libmpdemux/Makefile4
-rw-r--r--libmpdvdkit2/Makefile3
-rw-r--r--libmpeg2/Makefile4
-rw-r--r--libvo/Makefile4
-rw-r--r--loader/Makefile2
-rw-r--r--loader/dmo/Makefile4
-rw-r--r--loader/dshow/Makefile4
-rw-r--r--mp3lib/Makefile4
-rw-r--r--osdep/Makefile4
-rw-r--r--postproc/Makefile4
-rw-r--r--tremor/Makefile4
-rw-r--r--vidix/Makefile4
-rw-r--r--vidix/drivers/Makefile4
25 files changed, 52 insertions, 51 deletions
diff --git a/Makefile b/Makefile
index 3e883071bd..f230220755 100644
--- a/Makefile
+++ b/Makefile
@@ -521,11 +521,11 @@ endif
@echo "Uninstall completed"
clean:
- -rm -f *.o *~ $(OBJS) codecs.conf.h
+ -rm -f *.o *.a *~ codecs.conf.h
-distclean: doxygen_clean
- -rm -f *~ $(PRG) $(PRG_MENCODER) $(PRG_CFG) $(OBJS)
- -rm -f *.o *.a .depend configure.log codecs.conf.h help_mp.h
+distclean: clean doxygen_clean
+ -rm -f *~ $(PRG) $(PRG_MENCODER) $(PRG_CFG)
+ -rm -f .depend configure.log codecs.conf.h help_mp.h
@for a in $(PARTS); do $(MAKE) -C $$a distclean; done
strip:
diff --git a/TOOLS/netstream/Makefile b/TOOLS/netstream/Makefile
index 1e317d6b3d..289fb83b05 100644
--- a/TOOLS/netstream/Makefile
+++ b/TOOLS/netstream/Makefile
@@ -52,8 +52,8 @@ netstream: $(MPROOT)/libmpdemux/libmpdemux.a netstream.o
clean:
rm -f *.o *.a *~
-distclean:
- rm -f test Makefile.bak *.o *.a *~ .depend
+distclean: clean
+ rm -f .depend test
dep: depend
diff --git a/drivers/Makefile b/drivers/Makefile
index f7f2dd6e55..8d431d9781 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -49,10 +49,8 @@ endif
dep:
clean:
- rm -f *.o *~
-ifneq (,$(findstring 2.6, $(VERSION)))
+ rm -f *.o *.a *~
rm -f *.ko .mga* mga_vid.mod.c
-endif
distclean: clean
rm -f mga_vid_test tdfx_vid_tst
diff --git a/drivers/radeon/Makefile b/drivers/radeon/Makefile
index 366b9a21be..7b0bfc15a7 100644
--- a/drivers/radeon/Makefile
+++ b/drivers/radeon/Makefile
@@ -30,7 +30,9 @@ rage128_vid.o: radeon_vid.c radeon.h radeon_vid.h
dep:
clean:
- rm -f *.o *~
+ rm -f *.o *.a *~
+
+distclean: clean
install:
mkdir -p $(MOD_PATH)
diff --git a/input/Makefile b/input/Makefile
index e0d6890cbd..9711e8f31b 100644
--- a/input/Makefile
+++ b/input/Makefile
@@ -23,8 +23,8 @@ all: $(LIBNAME)
clean:
rm -f *.o *.a *~
-distclean:
- rm -f Makefile.bak *.o *.a *~ .depend
+distclean: clean
+ rm -f .depend
dep: depend
diff --git a/liba52/Makefile b/liba52/Makefile
index 0a52a165a1..12e1684d51 100644
--- a/liba52/Makefile
+++ b/liba52/Makefile
@@ -30,8 +30,8 @@ all: $(LIBNAME)
clean:
rm -f *.o *.a *~
-distclean:
- rm -f test *.o *.a *~ .depend
+distclean: clean
+ rm -f .depend test
dep: depend
diff --git a/libaf/Makefile b/libaf/Makefile
index 7b577004fd..26671d327a 100644
--- a/libaf/Makefile
+++ b/libaf/Makefile
@@ -60,8 +60,8 @@ all: $(LIBNAME)
clean:
rm -f *.o *.a *~
-distclean:
- rm -f *.o *.a *~ .depend
+distclean: clean
+ rm -f .depend
dep: depend
diff --git a/libao2/Makefile b/libao2/Makefile
index 80f8c05b7b..1153f5a7f2 100644
--- a/libao2/Makefile
+++ b/libao2/Makefile
@@ -37,8 +37,8 @@ all: $(LIBNAME)
clean:
rm -f *.o *.a *~
-distclean:
- rm -f Makefile.bak *.o *.a *~ .depend
+distclean: clean
+ rm -f .depend
dep: depend
diff --git a/libdha/Makefile b/libdha/Makefile
index 5f3cf16beb..68d8483725 100644
--- a/libdha/Makefile
+++ b/libdha/Makefile
@@ -66,10 +66,10 @@ test:
$(CC) test.c -o test $(SHORTNAME)
clean:
- rm -f *.o *.so *.so.* *~
+ rm -f *.o *.a *~ *.so *.so.*
-distclean:
- rm -f Makefile.bak *.o *.so *.so.* test *~ .depend
+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
diff --git a/libfaad2/Makefile b/libfaad2/Makefile
index 5e521ba4e6..7e3be6a33a 100644
--- a/libfaad2/Makefile
+++ b/libfaad2/Makefile
@@ -65,8 +65,8 @@ all: $(LIBNAME)
clean:
rm -f *.o *.a *~
-distclean:
- rm -f test *.o *.a *~ .depend
+distclean: clean
+ rm -f .depend test
dep: depend
diff --git a/libmenu/Makefile b/libmenu/Makefile
index f58a8af1cc..19f8f16b97 100644
--- a/libmenu/Makefile
+++ b/libmenu/Makefile
@@ -27,8 +27,8 @@ all: $(LIBNAME)
clean:
rm -f *.o *.a *~
-distclean:
- rm -f Makefile.bak *.o *.a *~ .depend
+distclean: clean
+ rm -f .depend
dep: depend
diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 494d27bd34..cd3e801ef4 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -262,8 +262,8 @@ clean:
rm -f *.o *.a *~
rm -f native/*.o native/*.a native/*~
-distclean:
- rm -f Makefile.bak $(OBJS) $(OBJS2) $(LIBNAME) $(LIBNAME2) *~ .depend
+distclean: clean
+ rm -f .depend
dep: depend
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index 12fb6b6f0a..03ce959cf8 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -180,8 +180,8 @@ test: $(LIBNAME) test.c
clean:
rm -f *.o *.a *~ realrtsp/*.o realrtsp/*.a realrtsp/*~
-distclean:
- rm -f test Makefile.bak *.o *.a *~ realrtsp/*.o realrtsp/*.a realrtsp/*~ .depend
+distclean: clean
+ rm -f .depend test
dep: depend
diff --git a/libmpdvdkit2/Makefile b/libmpdvdkit2/Makefile
index 5ac6e0ad13..a789d40a90 100644
--- a/libmpdvdkit2/Makefile
+++ b/libmpdvdkit2/Makefile
@@ -61,9 +61,10 @@ $(LIB).so: $(OBJS)
$(CC) -o $(LIB).so -shared -rdynamic $(OBJS)
clean:
- rm -f $(OBJS) $(LIB).a $(LIB).so .depend
+ rm -f *.o *.a *~ *.so
distclean: clean
+ rm -f .depend
dep: depend
diff --git a/libmpeg2/Makefile b/libmpeg2/Makefile
index 137957b23e..84655bc9eb 100644
--- a/libmpeg2/Makefile
+++ b/libmpeg2/Makefile
@@ -45,8 +45,8 @@ all: $(LIBNAME)
clean:
rm -f *.o *.a *~
-distclean:
- rm -f Makefile.bak *.o *.a *~ .depend
+distclean: clean
+ rm -f .depend
dep: depend
diff --git a/libvo/Makefile b/libvo/Makefile
index 19b1c4dade..ecb4203c99 100644
--- a/libvo/Makefile
+++ b/libvo/Makefile
@@ -63,8 +63,8 @@ all: $(LIBNAME)
clean:
rm -f *.o *.a *~
-distclean:
- rm -f Makefile.bak *.o *.a *~ .depend
+distclean: clean
+ rm -f .depend
dep: depend
diff --git a/loader/Makefile b/loader/Makefile
index 9a69e3a4f1..52a953f108 100644
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -27,7 +27,7 @@ CFLAGS=-I. -I.. $(OPTFLAGS) -U_FILE_OFFSET_BITS $(EXTRA_INC) $(WARN_FLAGS) -fno-
all: libloader.a
clean:
- -rm -f *.o libloader.a
+ rm -f *.o *.a *~
distclean: clean
diff --git a/loader/dmo/Makefile b/loader/dmo/Makefile
index fa95364411..70d861d89f 100644
--- a/loader/dmo/Makefile
+++ b/loader/dmo/Makefile
@@ -28,8 +28,8 @@ all: $(LIBNAME)
clean:
rm -f *.o *.a *~
-distclean:
- rm -f Makefile.bak *.o *.a *~ .depend test test.raw
+distclean: clean
+ rm -f .depend test test.raw
dep: depend
diff --git a/loader/dshow/Makefile b/loader/dshow/Makefile
index e4973fd35d..9250f5ff6d 100644
--- a/loader/dshow/Makefile
+++ b/loader/dshow/Makefile
@@ -30,8 +30,8 @@ all: $(LIBNAME)
clean:
rm -f *.o *.a *~
-distclean:
- rm -f Makefile.bak *.o *.a *~ .depend test test.raw
+distclean: clean
+ rm -f .depend test test.raw
dep: depend
diff --git a/mp3lib/Makefile b/mp3lib/Makefile
index 922ed8bf4b..f8c613e581 100644
--- a/mp3lib/Makefile
+++ b/mp3lib/Makefile
@@ -58,8 +58,8 @@ test2: libMP3.a test2.c
clean:
rm -f *~ *.o *.a test1 test2
-distclean:
- rm -f *~ *.o *.a Makefile.bak .depend
+distclean: clean
+ rm -f .depend
dep: depend
diff --git a/osdep/Makefile b/osdep/Makefile
index 341da0d9eb..0ec2038e33 100644
--- a/osdep/Makefile
+++ b/osdep/Makefile
@@ -47,8 +47,8 @@ all: $(LIBNAME)
clean:
rm -f *.o *.a *~
-distclean:
- rm -f Makefile.bak *.o *.a *~ .depend
+distclean: clean
+ rm -f .depend
dep: depend
diff --git a/postproc/Makefile b/postproc/Makefile
index 06caa9ad1c..475bd31381 100644
--- a/postproc/Makefile
+++ b/postproc/Makefile
@@ -30,8 +30,8 @@ $(SWSLIB): $(SWSOBJS)
clean:
rm -f *.o *.a *~ *.so cs_test swscale-example
-distclean:
- rm -f Makefile.bak *.o *.a *~ *.so .depend cs_test swscale-example
+distclean: clean
+ rm -f .depend
dep: depend
diff --git a/tremor/Makefile b/tremor/Makefile
index 68f27e653b..61e0813285 100644
--- a/tremor/Makefile
+++ b/tremor/Makefile
@@ -26,8 +26,8 @@ all: $(LIBNAME)
clean:
rm -f *.o *.a *~
-distclean:
- rm -f Makefile.bak *.o *.a *~ .depend
+distclean: clean
+ rm -f .depend
dep: depend
diff --git a/vidix/Makefile b/vidix/Makefile
index 856fe89a2b..b840c7615e 100644
--- a/vidix/Makefile
+++ b/vidix/Makefile
@@ -27,8 +27,8 @@ clean:
rm -f *.o *.a *~
$(DO_MAKE)
-distclean:
- rm -f test *.o *.a *~ .depend
+distclean: clean
+ rm -f .depend test
$(DO_MAKE)
dep: depend
diff --git a/vidix/drivers/Makefile b/vidix/drivers/Makefile
index 61bcd158f8..3267b348f3 100644
--- a/vidix/drivers/Makefile
+++ b/vidix/drivers/Makefile
@@ -152,8 +152,8 @@ $(SAVAGE_VID): $(SAVAGE_OBJS)
clean:
rm -f *.o *.so *~
-distclean:
- rm -f Makefile.bak *.o *.so test *~ .depend
+distclean: clean
+ rm -f .depend test
dep: depend