fix CONFIG_SMALL case

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index ebcb2d826dd42afb8b3910146bf1eb494879e4c8..50c3f2ca67a3a657156fdb0299fcf19db5fb4741 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)
@@ -35,23 +33,20 @@ ALLPROGS=$(addsuffix $(EXESUF), $(BASENAMES))
 ALLPROGS_G=$(addsuffix _g$(EXESUF), $(BASENAMES))
 ALLMANPAGES=$(addsuffix .1, $(BASENAMES))
 
-ifeq ($(CONFIG_AUDIO_BEOS),yes)
-EXTRALIBS+=-lmedia -lbe
-endif
-
 ifeq ($(BUILD_SHARED),yes)
 DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
 else
 DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
 endif
 
-ifeq ($(BUILD_VHOOK),yes)
+ifeq ($(CONFIG_VHOOK),yes)
 VHOOK=videohook
 INSTALLVHOOK=install-vhook
 endif
 
 ifeq ($(BUILD_DOC),yes)
 DOC=documentation
+INSTALLMAN=install-man
 endif
 
 OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
@@ -64,7 +59,7 @@ LDFLAGS+=-L./libswscale
 EXTRALIBS+=-lswscale$(BUILDSUF)
 endif
 
-all: lib $(PROGS_G) $(PROGS) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
+all: lib $(PROGS_G) $(PROGS) $(VHOOK) $(DOC)
 
 lib:
        $(MAKE) -C libavutil   all
@@ -90,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)
 
@@ -116,7 +116,7 @@ videohook: .libs
 documentation:
        $(MAKE) -C doc all
 
-install: install-progs install-libs install-headers install-man $(INSTALLVHOOK)
+install: install-progs install-libs install-headers $(INSTALLMAN) $(INSTALLVHOOK)
 
 ifeq ($(BUILD_SHARED),yes)
 install-progs: $(PROGS) install-libs
@@ -130,14 +130,9 @@ endif
 wininstaller: all install
        makensis ffinstall.nsi
 
-# install man from source dir if available
 install-man:
-ifneq ($(CONFIG_MINGW),yes)
-       if [ -f doc/ffmpeg.1 ] ; then \
-           install -d "$(mandir)/man1" ; \
-           install -m 644 $(MANPAGES) "$(mandir)/man1" ; \
-       fi
-endif
+       install -d "$(mandir)/man1"
+       install -m 644 $(MANPAGES) "$(mandir)/man1"
 
 install-vhook:
        $(MAKE) -C vhook install
@@ -172,9 +167,7 @@ uninstall-progs:
        rm -f $(addprefix $(bindir)/, $(ALLPROGS))
 
 uninstall-man:
-ifneq ($(CONFIG_MINGW),yes)
        rm -f $(addprefix $(mandir)/man1/,$(ALLMANPAGES))
-endif
 
 uninstall-vhook:
        $(MAKE) -C vhook uninstall
@@ -193,9 +186,7 @@ uninstall-headers:
        -rmdir "$(incdir)"
        -rmdir "$(prefix)/include/postproc"
 
-dep:   depend
-
-depend: .depend
+depend dep: .depend
        $(MAKE) -C libavutil   depend
        $(MAKE) -C libavcodec  depend
        $(MAKE) -C libavformat depend
@@ -205,16 +196,17 @@ endif
 ifeq ($(CONFIG_SWSCALER),yes)
        $(MAKE) -C libswscale  depend
 endif
-ifeq ($(BUILD_VHOOK),yes)
+ifeq ($(CONFIG_VHOOK),yes)
        $(MAKE) -C vhook       depend
 endif
 
 .depend: $(SRCS) version.h
-       $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(SRCS) 1>.depend
+       $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
+
+$(DEP_LIBS): lib
 
-.libs: lib
-       @test -f .libs || touch .libs
-       @for i in $(DEP_LIBS) ; do if test $$i -nt .libs ; then touch .libs; fi ; done
+.libs: $(DEP_LIBS)
+       touch $@
 
 clean:
        $(MAKE) -C libavutil   clean
@@ -225,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
@@ -247,18 +238,8 @@ TAGS:
 codectest libavtest test-server fulltest test mpeg4 mpeg: $(PROGS)
        $(MAKE) -C tests $@
 
-# tar release (use 'make -k tar' on a checkouted tree)
-FILE=ffmpeg-$(shell grep "\#define FFMPEG_VERSION " version.h | \
-                    cut -d "\"" -f 2 )
-
-tar:
-       rm -rf /tmp/$(FILE)
-       cp -r . /tmp/$(FILE)
-       ( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude .svn )
-       rm -rf /tmp/$(FILE)
-
 .PHONY: all lib videohook documentation install* wininstaller uninstall*
-.PHONY: dep depend clean distclean TAGS tar
+.PHONY: dep depend clean distclean TAGS
 .PHONY: codectest libavtest test-server fulltest test mpeg4 mpeg
 
 ifneq ($(wildcard .depend),)