diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-01-15 00:28:36 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-01-15 00:28:36 +0000 |
| commit | 29a10be0d4c748446de746eecf1cfeaedcbe0aff (patch) | |
| tree | 2e8cee3980e07f6b9c9b8b71d0cbcf74ef8f28d8 | |
| parent | 69e9b2cf451eda4f9500cbe3c5a0419fef821078 (diff) | |
| download | ffmpeg-29a10be0d4c748446de746eecf1cfeaedcbe0aff.tar.gz | |
Don't use 'rm -f *$(SLIBSUF)' in a clean rule, $(SLIBSUF) might be empty.
Remove all possible shared libs suffixes instead.
Originally committed as revision 4860 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/Makefile | 3 | ||||
| -rw-r--r-- | libavcodec/libpostproc/Makefile | 6 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavutil/Makefile | 2 | ||||
| -rw-r--r-- | vhook/Makefile | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 2d1302a5fe..81a6d1365b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -444,7 +444,8 @@ depend: $(SRCS) dep: depend clean: $(CLEANAMR) - rm -f *.o *.d *~ .depend $(LIB) $(SLIBNAME) *$(SLIBSUF) i386/*.o i386/*~ \ + rm -f *.o *.d *~ i386/*.o i386/*~ \ + *.a *.lib *.so *.dylib *.dll \ armv4l/*.o armv4l/*~ \ mlib/*.o mlib/*~ \ alpha/*.o alpha/*~ \ diff --git a/libavcodec/libpostproc/Makefile b/libavcodec/libpostproc/Makefile index 7c7f8b487f..a549f31842 100644 --- a/libavcodec/libpostproc/Makefile +++ b/libavcodec/libpostproc/Makefile @@ -25,10 +25,10 @@ CFLAGS = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC) all: $(SWSLIB) $(LIB) $(SLIBNAME) clean: - rm -f *.o *.a *~ *$(SLIBSUF) $(LIB) $(SLIBNAME) + rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll -distclean: - rm -f Makefile.bak *.o *.a *~ *$(SLIBSUF) .depend +distclean: clean + rm -f Makefile.bak .depend dep: depend diff --git a/libavformat/Makefile b/libavformat/Makefile index 4c83744204..b88c90f74a 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -143,7 +143,7 @@ install-headers: g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $< distclean clean: - rm -f *.o *.d .depend *~ *.a *$(SLIBSUF) $(LIB) + rm -f *.o *.d *~ .depend *.a *.lib *.so *.dylib *.dll # # include dependency files if they exist diff --git a/libavutil/Makefile b/libavutil/Makefile index a4b902c62a..99a4c114f7 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -50,7 +50,7 @@ depend: $(SRCS) dep: depend clean: - rm -f *.o *.d *~ .depend $(LIB) $(SLIBNAME) *$(SLIBSUF) + rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll distclean: clean rm -f Makefile.bak .depend diff --git a/vhook/Makefile b/vhook/Makefile index f473a6e8d3..1ee2c5ef55 100644 --- a/vhook/Makefile +++ b/vhook/Makefile @@ -40,7 +40,7 @@ drawtext$(SLIBSUF): drawtext.o $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< clean: - rm -f *.o *.d .depend *$(SLIBSUF) *~ + rm -f *.o *.d *~ .depend *.a *.lib *.so *.dylib *.dll ifneq ($(wildcard .depend),) include .depend |