mirror of https://git.ffmpeg.org/ffmpeg.git
Make sure that ffmpeg_g and ffplay_g get removed on 'make clean'.
Originally committed as revision 4893 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
0e8b594fe2
commit
767b49a56e
8
Makefile
8
Makefile
|
@ -15,7 +15,8 @@ LDFLAGS+=-p
|
||||||
endif
|
endif
|
||||||
|
|
||||||
MANPAGE=doc/ffmpeg.1
|
MANPAGE=doc/ffmpeg.1
|
||||||
PROG=ffmpeg$(EXESUF)
|
PROG_G+=ffmpeg_g$(EXESUF)
|
||||||
|
PROG+=ffmpeg$(EXESUF)
|
||||||
PROGTEST=output_example$(EXESUF)
|
PROGTEST=output_example$(EXESUF)
|
||||||
QTFASTSTART=qt-faststart$(EXESUF)
|
QTFASTSTART=qt-faststart$(EXESUF)
|
||||||
|
|
||||||
|
@ -26,6 +27,7 @@ endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_FFPLAY),yes)
|
ifeq ($(CONFIG_FFPLAY),yes)
|
||||||
MANPAGE+=doc/ffplay.1
|
MANPAGE+=doc/ffplay.1
|
||||||
|
PROG_G+=ffplay_g$(EXESUF)
|
||||||
PROG+=ffplay$(EXESUF)
|
PROG+=ffplay$(EXESUF)
|
||||||
FFPLAY_O=ffplay.o
|
FFPLAY_O=ffplay.o
|
||||||
endif
|
endif
|
||||||
|
@ -59,7 +61,7 @@ OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O)
|
||||||
SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
|
SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
|
||||||
FFLIBS = -L./libavformat -lavformat$(BUILDSUF) -L./libavcodec -lavcodec$(BUILDSUF) -L./libavutil -lavutil$(BUILDSUF)
|
FFLIBS = -L./libavformat -lavformat$(BUILDSUF) -L./libavcodec -lavcodec$(BUILDSUF) -L./libavutil -lavutil$(BUILDSUF)
|
||||||
|
|
||||||
all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
|
all: lib $(PROG_G) $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
|
||||||
|
|
||||||
lib:
|
lib:
|
||||||
$(MAKE) -C libavutil all
|
$(MAKE) -C libavutil all
|
||||||
|
@ -157,7 +159,7 @@ clean:
|
||||||
$(MAKE) -C tests clean
|
$(MAKE) -C tests clean
|
||||||
$(MAKE) -C vhook clean
|
$(MAKE) -C vhook clean
|
||||||
rm -f *.o *.d *~ .libs gmon.out TAGS \
|
rm -f *.o *.d *~ .libs gmon.out TAGS \
|
||||||
$(PROG) $(PROGTEST) $(QTFASTSTART)
|
$(PROG) $(PROG_G) $(PROGTEST) $(QTFASTSTART)
|
||||||
|
|
||||||
# Note well: config.log is NOT removed.
|
# Note well: config.log is NOT removed.
|
||||||
distclean: clean
|
distclean: clean
|
||||||
|
|
Loading…
Reference in New Issue