diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-01-24 20:27:08 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-01-24 20:27:08 +0000 |
| commit | 767b49a56e56151babde2011cbefeec4968f949f (patch) | |
| tree | 4586ebd270a80b65715139486e1d245a7e7c0cd3 | |
| parent | 0e8b594fe2cbc5a623bf72d887adabec46262e72 (diff) | |
| download | ffmpeg-767b49a56e56151babde2011cbefeec4968f949f.tar.gz | |
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
| -rw-r--r-- | Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -15,7 +15,8 @@ LDFLAGS+=-p endif MANPAGE=doc/ffmpeg.1 -PROG=ffmpeg$(EXESUF) +PROG_G+=ffmpeg_g$(EXESUF) +PROG+=ffmpeg$(EXESUF) PROGTEST=output_example$(EXESUF) QTFASTSTART=qt-faststart$(EXESUF) @@ -26,6 +27,7 @@ endif ifeq ($(CONFIG_FFPLAY),yes) MANPAGE+=doc/ffplay.1 +PROG_G+=ffplay_g$(EXESUF) PROG+=ffplay$(EXESUF) FFPLAY_O=ffplay.o endif @@ -59,7 +61,7 @@ OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O) SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) 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: $(MAKE) -C libavutil all @@ -157,7 +159,7 @@ clean: $(MAKE) -C tests clean $(MAKE) -C vhook clean rm -f *.o *.d *~ .libs gmon.out TAGS \ - $(PROG) $(PROGTEST) $(QTFASTSTART) + $(PROG) $(PROG_G) $(PROGTEST) $(QTFASTSTART) # Note well: config.log is NOT removed. distclean: clean |