mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-07-01 21:48:15 +08:00
Make clean/distclean consistent throughout all the Makefiles.
Originally committed as revision 4863 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
15
Makefile
15
Makefile
@ -43,7 +43,6 @@ endif
|
|||||||
ifeq ($(BUILD_VHOOK),yes)
|
ifeq ($(BUILD_VHOOK),yes)
|
||||||
VHOOK=videohook
|
VHOOK=videohook
|
||||||
INSTALLVHOOK=install-vhook
|
INSTALLVHOOK=install-vhook
|
||||||
CLEANVHOOK=clean-vhook
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(TARGET_OS), SunOS)
|
ifeq ($(TARGET_OS), SunOS)
|
||||||
@ -151,21 +150,23 @@ endif
|
|||||||
@test -f .libs || touch .libs
|
@test -f .libs || touch .libs
|
||||||
@for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
|
@for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
|
||||||
|
|
||||||
clean: $(CLEANVHOOK)
|
clean:
|
||||||
$(MAKE) -C libavutil clean
|
$(MAKE) -C libavutil clean
|
||||||
$(MAKE) -C libavcodec clean
|
$(MAKE) -C libavcodec clean
|
||||||
$(MAKE) -C libavformat clean
|
$(MAKE) -C libavformat clean
|
||||||
$(MAKE) -C tests clean
|
$(MAKE) -C tests clean
|
||||||
rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) \
|
|
||||||
ffplay_g$(EXESUF) $(PROG) $(PROGTEST) $(QTFASTSTART)
|
|
||||||
|
|
||||||
clean-vhook:
|
|
||||||
$(MAKE) -C vhook clean
|
$(MAKE) -C vhook clean
|
||||||
|
rm -f *.o *.d *~ .libs gmon.out TAGS \
|
||||||
|
$(PROG) $(PROGTEST) $(QTFASTSTART)
|
||||||
|
|
||||||
# Note well: config.log is NOT removed.
|
# Note well: config.log is NOT removed.
|
||||||
distclean: clean
|
distclean: clean
|
||||||
|
$(MAKE) -C libavutil distclean
|
||||||
$(MAKE) -C libavcodec distclean
|
$(MAKE) -C libavcodec distclean
|
||||||
rm -f config.mak config.h *.pc
|
$(MAKE) -C libavformat distclean
|
||||||
|
$(MAKE) -C tests distclean
|
||||||
|
$(MAKE) -C vhook distclean
|
||||||
|
rm -f Makefile.bak .depend config.mak config.h *.pc
|
||||||
|
|
||||||
TAGS:
|
TAGS:
|
||||||
etags *.[ch] libavformat/*.[ch] libavcodec/*.[ch]
|
etags *.[ch] libavformat/*.[ch] libavcodec/*.[ch]
|
||||||
|
@ -444,8 +444,8 @@ depend: $(SRCS)
|
|||||||
dep: depend
|
dep: depend
|
||||||
|
|
||||||
clean: $(CLEANAMR)
|
clean: $(CLEANAMR)
|
||||||
rm -f *.o *.d *~ i386/*.o i386/*~ \
|
rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll \
|
||||||
*.a *.lib *.so *.dylib *.dll \
|
i386/*.o i386/*~ \
|
||||||
armv4l/*.o armv4l/*~ \
|
armv4l/*.o armv4l/*~ \
|
||||||
mlib/*.o mlib/*~ \
|
mlib/*.o mlib/*~ \
|
||||||
alpha/*.o alpha/*~ \
|
alpha/*.o alpha/*~ \
|
||||||
@ -459,6 +459,7 @@ clean: $(CLEANAMR)
|
|||||||
|
|
||||||
distclean: clean
|
distclean: clean
|
||||||
rm -f Makefile.bak .depend
|
rm -f Makefile.bak .depend
|
||||||
|
$(MAKE) -C libpostproc distclean
|
||||||
|
|
||||||
cleanamr:
|
cleanamr:
|
||||||
$(MAKE) -C amr clean
|
$(MAKE) -C amr clean
|
||||||
|
@ -142,8 +142,11 @@ install-headers:
|
|||||||
%.o: %.cpp
|
%.o: %.cpp
|
||||||
g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
|
g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
|
||||||
|
|
||||||
distclean clean:
|
clean:
|
||||||
rm -f *.o *.d *~ .depend *.a *.lib *.so *.dylib *.dll
|
rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll
|
||||||
|
|
||||||
|
distclean: clean
|
||||||
|
rm -f Makefile.bak .depend
|
||||||
|
|
||||||
#
|
#
|
||||||
# include dependency files if they exist
|
# include dependency files if they exist
|
||||||
|
@ -72,6 +72,6 @@ dsptestpic: dsptest.c $(DSPDEPS)
|
|||||||
dsptest: dsptest.c $(DSPDEPS)
|
dsptest: dsptest.c $(DSPDEPS)
|
||||||
$(CC) -O4 -fomit-frame-pointer -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavcodec/i386 -I$(SRC_PATH)/libavcodec/ -o $@ $< -lm
|
$(CC) -O4 -fomit-frame-pointer -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavcodec/i386 -I$(SRC_PATH)/libavcodec/ -o $@ $< -lm
|
||||||
|
|
||||||
clean:
|
distclean clean:
|
||||||
rm -rf vsynth1 vsynth2 data
|
rm -rf vsynth1 vsynth2 data
|
||||||
rm -f asynth1.sw *~ audiogen videogen rotozoom tiny_psnr
|
rm -f asynth1.sw *~ audiogen videogen rotozoom tiny_psnr
|
||||||
|
@ -40,7 +40,10 @@ drawtext$(SLIBSUF): drawtext.o
|
|||||||
$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<
|
$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.o *.d *~ .depend *.a *.lib *.so *.dylib *.dll
|
rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll
|
||||||
|
|
||||||
|
distclean: clean
|
||||||
|
rm -f Makefile.bak .depend
|
||||||
|
|
||||||
ifneq ($(wildcard .depend),)
|
ifneq ($(wildcard .depend),)
|
||||||
include .depend
|
include .depend
|
||||||
|
Reference in New Issue
Block a user