[Ffmpeg-cvslog] CVS: ffmpeg Makefile,1.105,1.106
Diego Biurrun CVS
diego
Thu May 18 14:33:15 CEST 2006
Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv17575
Modified Files:
Makefile
Log Message:
Generate the list of all programs, unstripped programs and man pages in a more
elegant fashion and unconditionally remove all programs on clean.
Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/Makefile,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- Makefile 18 May 2006 12:19:07 -0000 1.105
+++ Makefile 18 May 2006 12:33:13 -0000 1.106
@@ -32,6 +32,11 @@
FFPLAY_O=ffplay.o
endif
+BASENAMES=ffmpeg ffplay ffserver
+ALLPROGS=$(addsuffix $(EXESUF), $(BASENAMES))
+ALLPROGS_G=$(addsuffix _g$(EXESUF), $(BASENAMES))
+ALLMANPAGES=$(addsuffix .1, $(BASENAMES))
+
ifeq ($(CONFIG_AUDIO_BEOS),yes)
EXTRALIBS+=-lmedia -lbe
endif
@@ -158,11 +163,9 @@
uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
-ALLPROGS=ffmpeg ffplay ffserver
uninstall-progs:
rm -f $(addprefix $(bindir)/, $(ALLPROGS))
-ALLMANPAGES=$(addsuffix .1, $(ALLPROGS))
uninstall-man:
ifneq ($(CONFIG_WIN32),yes)
rm -f $(addprefix $(mandir)/man1/,$(ALLMANPAGES))
@@ -209,7 +212,7 @@
$(MAKE) -C tests clean
$(MAKE) -C vhook clean
rm -f *.o *.d *~ .libs gmon.out TAGS \
- $(PROGS) $(PROGS_G) $(PROGTEST) $(QTFASTSTART)
+ $(ALLPROGS) $(ALLPROGS_G) $(PROGTEST) $(QTFASTSTART)
# Note well: config.log is NOT removed.
distclean: clean
More information about the ffmpeg-cvslog
mailing list