[SCM] libav/experimental: Make sure that ffmpeg_g and ffplay_g get removed on 'make clean'.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:46:06 UTC 2013
The following commit has been merged in the experimental branch:
commit 767b49a56e56151babde2011cbefeec4968f949f
Author: Diego Biurrun <diego at biurrun.de>
Date: Tue Jan 24 20:27:08 2006 +0000
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
diff --git a/Makefile b/Makefile
index ae3dcd8..4292ae9 100644
--- a/Makefile
+++ b/Makefile
@@ -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
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list