RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-11 18:09:36 +00:00
Code Issues Projects Releases Wiki Activity

Out-of-directory build patch by (Philipp Matthias Hahn <pmhahn titan.lahn de>)

Browse Source 
preserve support for spaces in directories in case of in-tree builds by (James A. Morrison <ja2morri csclub.uwaterloo ca>)

Originally committed as revision 3855 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Philipp Matthias Hahn 2005-01-21 22:16:05 +00:00 committed by Michael Niedermayer
parent ac930a999c
commit 8b8e1c5580
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -14,18 +14,18 @@ CFLAGS+=-p
LDFLAGS+=-p LDFLAGS+=-p
endif endif
MANPAGE=$(SRC_PATH)/doc/ffmpeg.1 MANPAGE=doc/ffmpeg.1
PROG=ffmpeg$(EXESUF) PROG=ffmpeg$(EXESUF)
PROGTEST=output_example$(EXESUF) PROGTEST=output_example$(EXESUF)
QTFASTSTART=qt-faststart$(EXESUF) QTFASTSTART=qt-faststart$(EXESUF)
ifeq ($(CONFIG_FFSERVER),yes) ifeq ($(CONFIG_FFSERVER),yes)
MANPAGE+=$(SRC_PATH)/doc/ffserver.1 MANPAGE+=doc/ffserver.1
PROG+=ffserver$(EXESUF) PROG+=ffserver$(EXESUF)
endif endif
ifeq ($(CONFIG_FFPLAY),yes) ifeq ($(CONFIG_FFPLAY),yes)
MANPAGE+=$(SRC_PATH)/doc/ffplay.1 MANPAGE+=doc/ffplay.1
PROG+=ffplay$(EXESUF) PROG+=ffplay$(EXESUF)
FFPLAY_O=ffplay.o FFPLAY_O=ffplay.o
endif endif
@ -146,7 +146,7 @@ wininstaller: all install
# install man from source dir if available # install man from source dir if available
install-man: install-man:
ifneq ($(CONFIG_WIN32),yes) ifneq ($(CONFIG_WIN32),yes)
if [ -f $(SRC_PATH)/doc/ffmpeg.1 ] ; then \ if [ -f doc/ffmpeg.1 ] ; then \
install -d "$(mandir)/man1" ; \ install -d "$(mandir)/man1" ; \
install -m 644 $(MANPAGE) "$(mandir)/man1" ; \ install -m 644 $(MANPAGE) "$(mandir)/man1" ; \
fi fi

13
configure vendored
View File

@ -1453,17 +1453,22 @@ fi
# build tree in object directory if source path is different from current one # build tree in object directory if source path is different from current one
if test "$source_path_used" = "yes" ; then if test "$source_path_used" = "yes" ; then
DIRS="libavformat libavcodec libavcodec/alpha libavcodec/armv4l libavcodec/i386 \ DIRS="doc libavformat libavcodec libavcodec/alpha libavcodec/armv4l \
libavcodec/ppc libavcodec/liba52 libavcodec/mlib libavcodec/libpostproc tests vhook" libavcodec/i386 libavcodec/sparc libavcodec/mlib \
FILES="Makefile libavformat/Makefile libavcodec/Makefile libavcodec/libpostproc/Makefile tests/Makefile vhook/Makefile" libavcodec/ppc libavcodec/liba52 libavcodec/libpostproc tests vhook"
FILES="Makefile libavformat/Makefile libavcodec/Makefile \
libavcodec/libpostproc/Makefile tests/Makefile vhook/Makefile \
doc/Makefile doc/texi2pod.pl"
for dir in $DIRS ; do for dir in $DIRS ; do
mkdir -p $dir mkdir -p $dir
done done
for f in $FILES ; do for f in $FILES ; do
ln -sf "$source_path/$f" $f ln -sf "$source_path/$f" $f
done done
echo "SRC_PATH=$source_path" >> config.mak
else
echo "SRC_PATH='$source_path'" >> config.mak
fi fi
echo "SRC_PATH='$source_path'" >> config.mak
if test "$amr_wb" = "yes" ; then if test "$amr_wb" = "yes" ; then
echo "#define AMR_WB 1" >> $TMPH echo "#define AMR_WB 1" >> $TMPH

4
doc/Makefile
View File

@ -1,3 +1,7 @@
-include ../config.mak
VPATH=$(SRC_PATH)/doc
all: ffmpeg-doc.html faq.html ffserver-doc.html ffplay-doc.html hooks.html \ all: ffmpeg-doc.html faq.html ffserver-doc.html ffplay-doc.html hooks.html \
ffmpeg.1 ffserver.1 ffplay.1 ffmpeg.1 ffserver.1 ffplay.1

4
libavcodec/Makefile
View File

@ -216,7 +216,7 @@ $(LIB): $(OBJS) $(AMRLIBS)
$(SLIB): $(OBJS) $(SLIB): $(OBJS)
ifeq ($(CONFIG_PP),yes) ifeq ($(CONFIG_PP),yes)
$(MAKE) -C $(VPATH)/libpostproc $(MAKE) -C libpostproc
endif endif
ifeq ($(CONFIG_WIN32),yes) ifeq ($(CONFIG_WIN32),yes)
$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
@ -299,7 +299,7 @@ else
ldconfig || true ldconfig || true
endif endif
ifeq ($(CONFIG_PP),yes) ifeq ($(CONFIG_PP),yes)
$(MAKE) -C $(VPATH)/libpostproc $@ $(MAKE) -C libpostproc $@
endif endif
else else
install: install: