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
This commit is contained in:
parent
69e9b2cf45
commit
29a10be0d4
@ -444,7 +444,8 @@ depend: $(SRCS)
|
|||||||
dep: depend
|
dep: depend
|
||||||
|
|
||||||
clean: $(CLEANAMR)
|
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/*~ \
|
armv4l/*.o armv4l/*~ \
|
||||||
mlib/*.o mlib/*~ \
|
mlib/*.o mlib/*~ \
|
||||||
alpha/*.o alpha/*~ \
|
alpha/*.o alpha/*~ \
|
||||||
|
|||||||
@ -25,10 +25,10 @@ CFLAGS = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
|
|||||||
all: $(SWSLIB) $(LIB) $(SLIBNAME)
|
all: $(SWSLIB) $(LIB) $(SLIBNAME)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.o *.a *~ *$(SLIBSUF) $(LIB) $(SLIBNAME)
|
rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll
|
||||||
|
|
||||||
distclean:
|
distclean: clean
|
||||||
rm -f Makefile.bak *.o *.a *~ *$(SLIBSUF) .depend
|
rm -f Makefile.bak .depend
|
||||||
|
|
||||||
dep: depend
|
dep: depend
|
||||||
|
|
||||||
|
|||||||
@ -143,7 +143,7 @@ install-headers:
|
|||||||
g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
|
g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
|
||||||
|
|
||||||
distclean clean:
|
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
|
# include dependency files if they exist
|
||||||
|
|||||||
@ -50,7 +50,7 @@ depend: $(SRCS)
|
|||||||
dep: depend
|
dep: depend
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.o *.d *~ .depend $(LIB) $(SLIBNAME) *$(SLIBSUF)
|
rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll
|
||||||
|
|
||||||
distclean: clean
|
distclean: clean
|
||||||
rm -f Makefile.bak .depend
|
rm -f Makefile.bak .depend
|
||||||
|
|||||||
@ -40,7 +40,7 @@ drawtext$(SLIBSUF): drawtext.o
|
|||||||
$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<
|
$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.o *.d .depend *$(SLIBSUF) *~
|
rm -f *.o *.d *~ .depend *.a *.lib *.so *.dylib *.dll
|
||||||
|
|
||||||
ifneq ($(wildcard .depend),)
|
ifneq ($(wildcard .depend),)
|
||||||
include .depend
|
include .depend
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user