From b02b3e8c3f489d8950f5ff4b2589b6ef0659e696 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 3 Oct 2020 23:44:06 +0200 Subject: [PATCH] rename BOXTYPE_COOL => BOXTYPE_CST Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8524f5f218dd3cba5c82a231a8eee90b088191e6 Author: vanhofen Date: 2020-10-03 (Sat, 03 Oct 2020) Origin message was: ------------------ - rename BOXTYPE_COOL => BOXTYPE_CST ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 2 +- data/y-web/images/Makefile.am | 2 +- lib/Makefile.am | 2 +- src/Makefile.am | 4 ++-- src/driver/Makefile.am | 2 +- src/gui/Makefile.am | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index d02f45c13..6c6fde0e0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -508,7 +508,7 @@ AC_SUBST(BOXMODEL) AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic") AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark") -AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream") +AM_CONDITIONAL(BOXTYPE_CST, test "$BOXTYPE" = "coolstream") AM_CONDITIONAL(BOXTYPE_ARMBOX, test "$BOXTYPE" = "armbox") AM_CONDITIONAL(BOXTYPE_MIPSBOX, test "$BOXTYPE" = "mipsbox") diff --git a/data/y-web/images/Makefile.am b/data/y-web/images/Makefile.am index a5210d5d8..f293f6c27 100644 --- a/data/y-web/images/Makefile.am +++ b/data/y-web/images/Makefile.am @@ -82,7 +82,7 @@ install_DATA = accept.png \ x_red.png \ zap.png -if BOXTYPE_COOL +if BOXTYPE_CST install_DATA += rc_cst_v1.jpg \ rc_cst_v2.png \ rc_cst_v3.png \ diff --git a/lib/Makefile.am b/lib/Makefile.am index 63e00773d..c6cfc59d8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -18,7 +18,7 @@ SUBDIRS += \ libupnpclient endif -if BOXTYPE_COOL +if BOXTYPE_CST SUBDIRS += \ hardware/coolstream endif diff --git a/src/Makefile.am b/src/Makefile.am index b8a3406ef..e15e3a61d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -152,7 +152,7 @@ neutrino_LDADD += \ $(top_builddir)/lib/libupnpclient/libtuxbox-upnpclient.a endif -if BOXTYPE_COOL +if BOXTYPE_CST neutrino_LDADD += \ $(top_builddir)/lib/hardware/coolstream/libhwcaps.a if ENABLE_LIBCOOLSTREAM_STATIC @@ -211,7 +211,7 @@ neutrino_LDADD += \ -L/opt/vc/lib/ -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt endif -if BOXTYPE_COOL +if BOXTYPE_CST bin_PROGRAMS += shutdown_helper shutdown_helper_SOURCES = shutdown_helper.c endif diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am index d73f51eae..eff265fe2 100644 --- a/src/driver/Makefile.am +++ b/src/driver/Makefile.am @@ -52,7 +52,7 @@ libneutrino_driver_a_SOURCES = \ streamts.cpp \ volume.cpp -if BOXTYPE_COOL +if BOXTYPE_CST libneutrino_driver_a_SOURCES += \ fb_accel_cs_hdx.cpp if BOXMODEL_CST_HD2 diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 29de5174f..c7034bff0 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -124,7 +124,7 @@ libneutrino_gui_a_SOURCES += \ glcdthemes.cpp endif -if BOXTYPE_COOL +if BOXTYPE_CST libneutrino_gui_a_SOURCES += \ streaminfo1.cpp else