From: jstebbins <jstebbins@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Date: Wed, 20 Aug 2008 06:29:03 +0000 (+0000)
Subject: LinGui: force use of contrib libs.  libtool seems to be pretty arbitrary
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=61d86ccbc0927d54a551a18f0768f239e196322f;p=handbrake-jp%2Fhandbrake-jp-git.git

LinGui: force use of contrib libs.  libtool seems to be pretty arbitrary
about where it picks libs from


git-svn-id: svn://localhost/HandBrake/trunk@1647 b64f7644-9d1e-0410-96f1-a4d463321fa5
---

diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index f55fe947..884b155b 100644
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -2,7 +2,33 @@
 
 ## Created by Anjuta
 
-HB_LIBS=$(HB_DIR)/libhb/libhb.a -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdread -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lxvidcore -lmp4v2 -lswscale -ltheora -lfaad -lz -lbz2 -lpthread
+#HB_LIBS=$(HB_DIR)/libhb/libhb.a -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdread -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lxvidcore -lmp4v2 -lswscale -ltheora -lfaad -lz -lbz2 -lpthread
+
+HB_LIBS=\
+	$(HB_DIR)/libhb/libhb.a \
+	$(HB_DIR)/contrib/lib/liba52.a \
+	$(HB_DIR)/contrib/lib/libmkv.a \
+	$(HB_DIR)/contrib/lib/libavformat.a \
+	$(HB_DIR)/contrib/lib/libavcodec.a \
+	$(HB_DIR)/contrib/lib/libavutil.a \
+	$(HB_DIR)/contrib/lib/libdca.a \
+	$(HB_DIR)/contrib/lib/libdvdread.a \
+	$(HB_DIR)/contrib/lib/libfaac.a \
+	$(HB_DIR)/contrib/lib/libmp3lame.a \
+	$(HB_DIR)/contrib/lib/libmpeg2.a \
+	$(HB_DIR)/contrib/lib/libvorbis.a \
+	$(HB_DIR)/contrib/lib/libvorbisenc.a \
+	$(HB_DIR)/contrib/lib/libogg.a \
+	$(HB_DIR)/contrib/lib/libsamplerate.a \
+	$(HB_DIR)/contrib/lib/libx264.a \
+	$(HB_DIR)/contrib/lib/libxvidcore.a \
+	$(HB_DIR)/contrib/lib/libmp4v2.a \
+	$(HB_DIR)/contrib/lib/libswscale.a \
+	$(HB_DIR)/contrib/lib/libtheora.a \
+	$(HB_DIR)/contrib/lib/libfaad.a \
+	-lz \
+	-lbz2 \
+	-lpthread
 
 icons =	\
 	hb-activity.32.png \