From e143ac9ca1416349b8e4286ce637a918ecfee127 Mon Sep 17 00:00:00 2001 From: "benjamin.drung@gmail.com" Date: Tue, 12 Nov 2013 23:58:43 +0000 Subject: [PATCH] Make sure that libogg is built before libflac if the local liboog is used. libflac needs to be linked against libogg. So we should built libogg before libflac if we use the local libogg. --- lib-src/Makefile.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 4dc57ad0f..9b71a31bf 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -20,7 +20,9 @@ libwidgetextra.a: widgetextra # libogg libogg-recursive: +ifneq (,$(findstring libogg.a,@LOCAL_LIBS@)) $(MAKE) -C libogg +endif libogg.a: libogg-recursive ln -sf libogg/src/.libs/libogg.a libogg.a @@ -33,7 +35,7 @@ libvorbis.a libvorbisfile.a libvorbisenc.a: libogg.a libvorbis-recursive ln -sf libvorbis/lib/.libs/libvorbisenc.a libvorbisenc.a # libflac -libflac-recursive: +libflac-recursive: libogg-recursive $(MAKE) -C libflac libFLAC++.a libFLAC.a: libflac-recursive ln -sf libflac/src/libFLAC++/.libs/libFLAC++-static.a libFLAC++.a