From cc2720221a49f6d65e604891382c9c3ab8f04129 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 11 Feb 2012 13:22:32 +0100 Subject: [PATCH] spark: DirectFB is not used Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/57176344f413d1f8d1fb05c9e738855faf7ba6d6 Author: Stefan Seyfried Date: 2012-02-11 (Sat, 11 Feb 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- Makefile.am | 5 +++++ configure.ac | 4 +++- libspark/Makefile.am | 5 ++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6ca7f15..9907dce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,12 @@ libstb_hal_a_LIBADD = \ libstb_hal_test_SOURCES = libtest.cpp libstb_hal_test_LDADD = \ libstb-hal.a \ + -lpthread + +if BOXTYPE_TRIPLE +libstb_hal_test_LDADD += \ @DIRECTFB_LIBS@ +endif # there has to be a better way to do this... if BOXTYPE_TRIPLE diff --git a/configure.ac b/configure.ac index 931140f..4f38271 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,9 @@ AC_DISABLE_STATIC AC_SYS_LARGEFILE AM_PROG_LIBTOOL -TUXBOX_APPS_LIB_PKGCONFIG(DIRECTFB, directfb) +if test x"$BOXTYPE" = x"tripledragon"; then + TUXBOX_APPS_LIB_PKGCONFIG(DIRECTFB, directfb) +fi AC_OUTPUT([ Makefile diff --git a/libspark/Makefile.am b/libspark/Makefile.am index a17abcb..78da1d7 100644 --- a/libspark/Makefile.am +++ b/libspark/Makefile.am @@ -1,10 +1,10 @@ INCLUDES = \ - -I$(top_srcdir)/common \ - @DIRECTFB_CFLAGS@ + -I$(top_srcdir)/common noinst_LIBRARIES = libspark.a AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing +AM_LDFLAGS = -lpthread libspark_a_SOURCES = \ irmp.c \ @@ -19,4 +19,3 @@ libspark_a_SOURCES = \ record.cpp AM_CPPFLAGS = -DF_INTERRUPTS=20000 -DIRMP_EMBED -DLIRC_IRMP -