[Ffmpeg-cvslog] CVS: ffmpeg Makefile,1.87,1.88
Diego Biurrun CVS
diego
Tue Jan 24 21:27:11 CET 2006
- Previous message: [Ffmpeg-cvslog] CVS: ffmpeg configure,1.238,1.239
- Next message: [Ffmpeg-cvslog] CVS: ffmpeg/libavcodec xvid_rc.c, NONE, 1.1 avcodec.h, 1.445, 1.446 Makefile, 1.227, 1.228 mpegvideo.h, 1.232, 1.233 ratecontrol.c, 1.53, 1.54
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv29790
Modified Files:
Makefile
Log Message:
Make sure that ffmpeg_g and ffplay_g get removed on 'make clean'.
Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/Makefile,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- Makefile 16 Jan 2006 14:59:54 -0000 1.87
+++ Makefile 24 Jan 2006 20:27:08 -0000 1.88
@@ -15,7 +15,8 @@
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 @@
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 @@
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 @@
$(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
- Previous message: [Ffmpeg-cvslog] CVS: ffmpeg configure,1.238,1.239
- Next message: [Ffmpeg-cvslog] CVS: ffmpeg/libavcodec xvid_rc.c, NONE, 1.1 avcodec.h, 1.445, 1.446 Makefile, 1.227, 1.228 mpegvideo.h, 1.232, 1.233 ratecontrol.c, 1.53, 1.54
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the ffmpeg-cvslog
mailing list