From a5aeedcb845e87d4a303ca04045e936ad1ee62be Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Sat, 1 Jun 2013 12:25:52 +0200
Subject: [PATCH] fix library declarations for libtool

Origin commit data
------------------
Branch: master
Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/e5e05ffa095fb0714507a85f3f64dd05493a141f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-01 (Sat, 01 Jun 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 Makefile.am            | 17 +----------------
 generic-pc/Makefile.am |  9 +++++++++
 libspark/Makefile.am   |  2 +-
 libtriple/Makefile.am  |  2 ++
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9a1589b..d5cd6a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,14 +9,7 @@ libstb_hal_la_LIBADD = \
 	common/libcommon.la
 
 libstb_hal_test_SOURCES = libtest.cpp
-libstb_hal_test_LDADD = \
-	libstb-hal.la \
-	-lpthread
-
-if BOXTYPE_TRIPLE
-libstb_hal_test_LDADD += \
-	@DIRECTFB_LIBS@
-endif
+libstb_hal_test_LDADD = libstb-hal.la
 
 # there has to be a better way to do this...
 if BOXTYPE_TRIPLE
@@ -33,14 +26,6 @@ if BOXTYPE_GENERIC
 SUBDIRS += generic-pc
 libstb_hal_la_LIBADD += \
 	generic-pc/libgeneric.la
-
-libstb_hal_test_LDADD += \
-	-lglut -lGL -lGLU -lGLEW -lao \
-	-lOpenThreads \
-	@AVFORMAT_LIBS@ \
-	@AVUTIL_LIBS@ \
-	@AVCODEC_LIBS@ \
-	@SWSCALE_LIBS@
 endif
 if BOXTYPE_SPARK
 SUBDIRS += libspark libeplayer3
diff --git a/generic-pc/Makefile.am b/generic-pc/Makefile.am
index a5be1e2..130e419 100644
--- a/generic-pc/Makefile.am
+++ b/generic-pc/Makefile.am
@@ -6,6 +6,15 @@ noinst_LTLIBRARIES = libgeneric.la
 AM_CPPFLAGS = -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
 
+AM_LDFLAGS = \
+	-lglut -lGL -lGLU -lGLEW -lao \
+	-lOpenThreads \
+	@AVFORMAT_LIBS@ \
+	@AVUTIL_LIBS@ \
+	@AVCODEC_LIBS@ \
+	@SWRESAMPLE_LIBS@ \
+	@SWSCALE_LIBS@
+
 libgeneric_la_SOURCES = \
 	hardware_caps.c \
 	dmx.cpp \
diff --git a/libspark/Makefile.am b/libspark/Makefile.am
index ffb7195..39afbd1 100644
--- a/libspark/Makefile.am
+++ b/libspark/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = \
 noinst_LTLIBRARIES = libspark.la
 
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
-AM_LDFLAGS = -lpthread
+AM_LDFLAGS = -lpthread -lass
 
 libspark_la_SOURCES = \
 	irmp.c \
diff --git a/libtriple/Makefile.am b/libtriple/Makefile.am
index 697be37..1bad773 100644
--- a/libtriple/Makefile.am
+++ b/libtriple/Makefile.am
@@ -5,6 +5,8 @@ INCLUDES = \
 noinst_LTLIBRARIES = libtriple.la
 
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
+AM_LDFLAGS = \
+	@DIRECTFB_LIBS@
 
 libtriple_la_SOURCES = \
 	hardware_caps.c \