This is no longer necessary for BeOS now that we don't play nasty tricks with error...

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 084452bac3d7388982234d57a7f55d7ca61c8fb0..a4b0a37f6ea02a9d6c1a770e7adbb652ec02fc86 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,6 @@ ifeq ($(CONFIG_FFMPEG),yes)
 MANPAGES=doc/ffmpeg.1
 PROGS_G+=ffmpeg_g$(EXESUF)
 PROGS+=ffmpeg$(EXESUF)
-PROGTEST=output_example$(EXESUF)
-QTFASTSTART=qt-faststart$(EXESUF)
 endif
 
 ifeq ($(CONFIG_FFSERVER),yes)
@@ -61,7 +59,7 @@ LDFLAGS+=-L./libswscale
 EXTRALIBS+=-lswscale$(BUILDSUF)
 endif
 
-all: lib $(PROGS_G) $(PROGS) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
+all: lib $(PROGS) $(VHOOK) $(DOC)
 
 lib:
        $(MAKE) -C libavutil   all
@@ -87,6 +85,11 @@ ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
        cp -p $< $@
        $(STRIP) $@
 
+SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries
+ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES))
+version.h: $(SVN_ENTRIES)
+endif
+
 version.h:
        $(SRC_PATH)/version.sh $(SRC_PATH)
 
@@ -121,9 +124,9 @@ else
 install-progs: $(PROGS)
 endif
        install -d "$(bindir)"
-       install -c $(INSTALLSTRIP) -m 755 $(PROGS) "$(bindir)"
+       install -c -m 755 $(PROGS) "$(bindir)"
 
-# create the window installer
+# Create the Windows installer.
 wininstaller: all install
        makensis ffinstall.nsi
 
@@ -200,9 +203,10 @@ endif
 .depend: $(SRCS) version.h
        $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
 
-.libs: lib
-       @test -f .libs || touch .libs
-       @for i in $(DEP_LIBS) ; do if test $$i -nt .libs ; then touch .libs; fi ; done
+$(DEP_LIBS): lib
+
+.libs: $(DEP_LIBS)
+       touch $@
 
 clean:
        $(MAKE) -C libavutil   clean
@@ -213,10 +217,9 @@ clean:
        $(MAKE) -C tests       clean
        $(MAKE) -C vhook       clean
        $(MAKE) -C doc         clean
-       rm -f *.o *.d *~ .libs gmon.out TAGS \
-          $(ALLPROGS) $(ALLPROGS_G) $(PROGTEST) $(QTFASTSTART)
+       rm -f *.o *.d *~ .libs gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \
+          output_example$(EXESUF) qt-faststart$(EXESUF) cws2fws$(EXESUF)
 
-# Note well: config.log is NOT removed.
 distclean: clean
        $(MAKE) -C libavutil   distclean
        $(MAKE) -C libavcodec  distclean