01-makefile_fix_updated.patch

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index d0ae79099d5c7aac17098f01e8c73e33daa2d113..25499724efb03fc01eebb478bd01d505dda5f628 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,18 +14,18 @@ CFLAGS+=-p
 LDFLAGS+=-p
 endif
 
-MANPAGE=$(SRC_PATH)/doc/ffmpeg.1
+MANPAGE=doc/ffmpeg.1
 PROG=ffmpeg$(EXESUF)
 PROGTEST=output_example$(EXESUF)
 QTFASTSTART=qt-faststart$(EXESUF)
 
 ifeq ($(CONFIG_FFSERVER),yes)
-MANPAGE+=$(SRC_PATH)/doc/ffserver.1
+MANPAGE+=doc/ffserver.1
 PROG+=ffserver$(EXESUF)
 endif
 
 ifeq ($(CONFIG_FFPLAY),yes)
-MANPAGE+=$(SRC_PATH)/doc/ffplay.1
+MANPAGE+=doc/ffplay.1
 PROG+=ffplay$(EXESUF)
 FFPLAY_O=ffplay.o
 endif
@@ -43,8 +43,14 @@ EXTRALIBS+=-lmp3lame
 endif
 endif
 
-ifeq ($(CONFIG_VORBIS),yes)
-EXTRALIBS+=-logg -lvorbis -lvorbisenc
+ifeq ($(CONFIG_LIBOGG),yes)
+EXTRALIBS+= -logg 
+ifeq ($(CONFIG_LIBVORBIS),yes)
+EXTRALIBS+= -lvorbis -lvorbisenc
+endif
+ifeq ($(CONFIG_LIBTHEORA),yes)
+EXTRALIBS+= -ltheora
+endif
 endif
 
 ifeq ($(CONFIG_FAAD),yes)
@@ -63,6 +69,10 @@ ifeq ($(CONFIG_XVID),yes)
 EXTRALIBS+=-lxvidcore
 endif
 
+ifeq ($(CONFIG_DC1394),yes)
+EXTRALIBS+=-ldc1394_control -lraw1394
+endif
+
 ifeq ($(BUILD_VHOOK),yes)
 VHOOK=videohook
 INSTALLVHOOK=install-vhook
@@ -112,6 +122,9 @@ output_example$(EXESUF): output_example.o .libs
 qt-faststart$(EXESUF): qt-faststart.c
        $(CC) $(SRC_PATH)/qt-faststart.c -o qt-faststart$(EXESUF)
 
+cws2fws$(EXESUF): cws2fws.c
+       $(CC) $(SRC_PATH)/cws2fws.c -o cws2fws$(EXESUF) -lz
+
 ffplay.o: ffplay.c
        $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $< 
 
@@ -130,7 +143,7 @@ install: all install-man $(INSTALLVHOOK)
        $(MAKE) -C libavcodec install
        $(MAKE) -C libavformat install
        install -d "$(bindir)"
-       install -c -s -m 755 $(PROG) "$(bindir)"
+       install -c $(INSTALLSTRIP) -m 755 $(PROG) "$(bindir)"
 
 # create the window installer
 wininstaller: all install
@@ -139,7 +152,7 @@ wininstaller: all install
 # install man from source dir if available
 install-man:
 ifneq ($(CONFIG_WIN32),yes)
-       if [ -f $(SRC_PATH)/doc/ffmpeg.1 ] ; then \
+       if [ -f doc/ffmpeg.1 ] ; then \
            install -d "$(mandir)/man1" ; \
            install -m 644 $(MANPAGE) "$(mandir)/man1" ; \
        fi
@@ -172,11 +185,13 @@ clean: $(CLEANVHOOK)
        $(MAKE) -C libavcodec clean
        $(MAKE) -C libavformat clean
        $(MAKE) -C tests clean
-       rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) ffplay_g$(EXESUF) $(PROG) $(PROGTEST)
+       rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) \
+          ffplay_g$(EXESUF) $(PROG) $(PROGTEST) $(QTFASTSTART)
 
 clean-vhook:
        $(MAKE) -C vhook clean
 
+# Note well: config.log is NOT removed.
 distclean: clean
        $(MAKE) -C libavcodec distclean
        rm -f config.mak config.h