From 6b991cb29fd03623bd9cc2faee01c832758233cf Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 18 May 2006 12:33:13 +0000 Subject: [PATCH] Generate the list of all programs, unstripped programs and man pages in a more elegant fashion and unconditionally remove all programs on clean. Originally committed as revision 5400 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b6e2cd08e6..e1deb521b4 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,11 @@ PROGS+=ffplay$(EXESUF) 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 @@ endif 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 @@ clean: $(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