diff --git a/Makefile.am b/Makefile.am
index b472c86..17cdd87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,35 +47,35 @@ libstb_hal_a_LIBADD += \
 # this is a hack to build the libeplayer3 objs statically into
 # libstb-hal...
 libstb_hal_a_LIBADD += \
-	libeplayer3/.libs/container.o \
-	libeplayer3/.libs/container_ffmpeg.o \
-	libeplayer3/.libs/text_srt.o \
-	libeplayer3/.libs/text_ssa.o \
-	libeplayer3/.libs/container_ass.o \
-	libeplayer3/.libs/audio.o \
-	libeplayer3/.libs/manager.o \
-	libeplayer3/.libs/subtitle.o \
-	libeplayer3/.libs/video.o \
-	libeplayer3/.libs/output_subtitle.o \
-	libeplayer3/.libs/linuxdvb.o \
-	libeplayer3/.libs/output.o \
-	libeplayer3/.libs/playback.o \
-	libeplayer3/.libs/writer.o \
-	libeplayer3/.libs/aac.o \
-	libeplayer3/.libs/wmv.o \
-	libeplayer3/.libs/ac3.o \
-	libeplayer3/.libs/divx.o \
-	libeplayer3/.libs/wma.o \
-	libeplayer3/.libs/pes.o \
-	libeplayer3/.libs/dts.o \
-	libeplayer3/.libs/mpeg2.o \
-	libeplayer3/.libs/mp3.o \
-	libeplayer3/.libs/misc.o \
-	libeplayer3/.libs/h264.o \
-	libeplayer3/.libs/h263.o \
-	libeplayer3/.libs/vc1.o \
-	libeplayer3/.libs/framebuffer.o \
-	libeplayer3/.libs/vorbis.o \
-	libeplayer3/.libs/flac.o \
-	libeplayer3/.libs/pcm.o
+	libeplayer3/container.o \
+	libeplayer3/container_ffmpeg.o \
+	libeplayer3/text_srt.o \
+	libeplayer3/text_ssa.o \
+	libeplayer3/container_ass.o \
+	libeplayer3/audio.o \
+	libeplayer3/manager.o \
+	libeplayer3/subtitle.o \
+	libeplayer3/video.o \
+	libeplayer3/output_subtitle.o \
+	libeplayer3/linuxdvb.o \
+	libeplayer3/output.o \
+	libeplayer3/playback.o \
+	libeplayer3/writer.o \
+	libeplayer3/aac.o \
+	libeplayer3/wmv.o \
+	libeplayer3/ac3.o \
+	libeplayer3/divx.o \
+	libeplayer3/wma.o \
+	libeplayer3/pes.o \
+	libeplayer3/dts.o \
+	libeplayer3/mpeg2.o \
+	libeplayer3/mp3.o \
+	libeplayer3/misc.o \
+	libeplayer3/h264.o \
+	libeplayer3/h263.o \
+	libeplayer3/vc1.o \
+	libeplayer3/framebuffer.o \
+	libeplayer3/vorbis.o \
+	libeplayer3/flac.o \
+	libeplayer3/pcm.o
 endif
diff --git a/libeplayer3/Makefile.am b/libeplayer3/Makefile.am
index 6f941ce..78d4d3b 100644
--- a/libeplayer3/Makefile.am
+++ b/libeplayer3/Makefile.am
@@ -1,11 +1,11 @@
-lib_LTLIBRARIES = libeplayer3.la
+noinst_LIBRARIES = libeplayer3.a
 
 CXXFLAGS = -Wall
 
 INCLUDES = \
 	-I$(srcdir)/include
 
-libeplayer3_la_SOURCES =  \
+libeplayer3_a_SOURCES =  \
 	container/container.c container/container_ffmpeg.c container/text_srt.c \
     container/text_ssa.c container/container_ass.c \
 	manager/audio.c manager/manager.c manager/subtitle.c manager/video.c \
@@ -19,11 +19,13 @@ libeplayer3_la_SOURCES =  \
 AM_CFLAGS = -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
 -D_LARGEFILE64_SOURCE
 
-libeplayer3_la_LIBADD = -lpthread -lavformat -lavcodec -lavutil -lz -lass -lm -lpng
 
+#libeplayer3_la_LIBADD = -lpthread -lavformat -lavcodec -lavutil -lz -lass -lm -lpng
+
+LIBEPLAYER3_LIBS = libeplayer3.a -lpthread -lavformat -lavcodec -lavutil -lz -lass -lm -lpng
 bin_PROGRAMS = eplayer3 meta
 eplayer3_SOURCES = tools/eplayer2.c
-eplayer3_LDADD =  -leplayer3 -lpthread -lass -lm -lpng
+eplayer3_LDADD = $(LIBEPLAYER3_LIBS)
 
 meta_SOURCES = tools/meta.c
-meta_LDADD =  -leplayer3 -lpthread -lass -lm -lpng
+meta_LDADD = $(LIBEPLAYER3_LIBS)