Revision 04a435d5

View differences:

THIRDPARTY-LIBS/Makefile
19 19
x264-install: x264-build
20 20
	$(MAKE) -C x264 install  || { echo "Error installing x264" && exit 1; }
21 21

  
22
ffmpeg/.git: x264-install
22
ffmpeg/.git:
23 23
	cd .. && git submodule update --init $(shell dirname $(THIRDPARTYLIBS)/$@)
24

  
25
ffmpeg/config.mak: ffmpeg/.git x264-install
24 26
	cd ffmpeg && ./configure --enable-libx264 --enable-gpl --enable-pthreads --extra-cflags=-I$(THIRDPARTYLIBS)/x264-install/include --extra-ldflags=-L$(THIRDPARTYLIBS)/x264-install/lib --prefix=$(THIRDPARTYLIBS)/ffmpeg-install || { echo "Error configuring ffmpeg" && exit 1; }
25 27
	#in case x264 is not reqired (do we need the encoding?): ./configure --enable-gpl --enable-pthreads --prefix=$BASEDIR/ffmpeg-install
26 28

  
27
ffmpeg-build: ffmpeg/.git
29
ffmpeg-build: ffmpeg/config.mak
28 30
	$(MAKE) -C ffmpeg || { echo "Error compiling ffmpeg" && exit 1; }
29 31

  
30 32
ffmpeg-install: ffmpeg-build

Also available in: Unified diff