From 99793f1362454126a30d995fc9e42853ae66eaea Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 23 Dec 2018 22:33:56 +0100 Subject: [PATCH] align includes and Makefiles to directory changes Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/52caa02ddce5b7c79675cec4c2bb1f568f147d5c Author: vanhofen Date: 2018-12-23 (Sun, 23 Dec 2018) Origin message was: ------------------ - align includes and Makefiles to directory changes ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- include/audio_hal.h | 6 +++--- include/playback_hal.h | 8 ++++---- include/record_hal.h | 6 +++--- include/video_hal.h | 6 +++--- libduckbox/Makefile.am | 2 +- libspark/Makefile.am | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/audio_hal.h b/include/audio_hal.h index f45ea2d..6ea7a74 100644 --- a/include/audio_hal.h +++ b/include/audio_hal.h @@ -10,12 +10,12 @@ #elif HAVE_ARM_HARDWARE #include "../libarmbox/audio_lib.h" #elif HAVE_AZBOX_HARDWARE -#include "../azbox/audio_lib.h" +#include "../libazbox/audio_lib.h" #elif HAVE_GENERIC_HARDWARE #if BOXMODEL_RASPI -#include "../raspi/audio_lib.h" +#include "../libraspi/audio_lib.h" #else -#include "../generic-pc/audio_lib.h" +#include "../libgeneric-pc/audio_lib.h" #endif #else #error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined diff --git a/include/playback_hal.h b/include/playback_hal.h index 690f4ab..e18cab2 100644 --- a/include/playback_hal.h +++ b/include/playback_hal.h @@ -12,15 +12,15 @@ #include "../libarmbox/playback_libeplayer3.h" #endif #elif HAVE_AZBOX_HARDWARE -#include "../azbox/playback_lib.h" +#include "../libazbox/playback_lib.h" #elif HAVE_GENERIC_HARDWARE #if BOXMODEL_RASPI -#include "../raspi/playback_lib.h" +#include "../libraspi/playback_lib.h" #else #if ENABLE_GSTREAMER -#include "../generic-pc/playback_gst.h" +#include "../libgeneric-pc/playback_gst.h" #else -#include "../generic-pc/playback_lib.h" +#include "../libgeneric-pc/playback_lib.h" #endif #endif #else diff --git a/include/record_hal.h b/include/record_hal.h index 40f50e6..a5b0fdf 100644 --- a/include/record_hal.h +++ b/include/record_hal.h @@ -8,12 +8,12 @@ #elif HAVE_ARM_HARDWARE #include "../libarmbox/record_lib.h" #elif HAVE_AZBOX_HARDWARE -#include "../azbox/record_lib.h" +#include "../libazbox/record_lib.h" #elif HAVE_GENERIC_HARDWARE #if BOXMODEL_RASPI -#include "../raspi/record_lib.h" +#include "../libraspi/record_lib.h" #else -#include "../generic-pc/record_lib.h" +#include "../libgeneric-pc/record_lib.h" #endif #else #error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined diff --git a/include/video_hal.h b/include/video_hal.h index 0ea7d6c..8e30d4c 100644 --- a/include/video_hal.h +++ b/include/video_hal.h @@ -9,12 +9,12 @@ #include "../libarmbox/video_lib.h" #include "../libarmbox/hdmi_cec.h" #elif HAVE_AZBOX_HARDWARE -#include "../azbox/video_lib.h" +#include "../libazbox/video_lib.h" #elif HAVE_GENERIC_HARDWARE #if BOXMODEL_RASPI -#include "../raspi/video_lib.h" +#include "../libraspi/video_lib.h" #else -#include "../generic-pc/video_lib.h" +#include "../libgeneric-pc/video_lib.h" #endif #else #error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined diff --git a/libduckbox/Makefile.am b/libduckbox/Makefile.am index 5b47cab..d636086 100644 --- a/libduckbox/Makefile.am +++ b/libduckbox/Makefile.am @@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libduckbox.la AM_CPPFLAGS = \ -I$(top_srcdir)/common \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/libeplayer3/include + -I$(top_srcdir)/libeplayer3-sh4/include AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing diff --git a/libspark/Makefile.am b/libspark/Makefile.am index 74f9837..50efca9 100644 --- a/libspark/Makefile.am +++ b/libspark/Makefile.am @@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libspark.la AM_CPPFLAGS = \ -I$(top_srcdir)/common \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/libeplayer3/include + -I$(top_srcdir)/libeplayer3-sh4/include AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing AM_LDFLAGS = \