mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

- rename BOXTYPE_COOL => BOXTYPE_CST

Browse Source 
Conflicts:
	src/driver/Makefile.am

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-10-03 23:44:06 +02:00
committed by Thilo Graf
parent 1c44541243
commit 6d127b927b
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acinclude.m4
View File

@@ -521,7 +521,7 @@ AC_SUBST(BOXMODEL)
AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic") AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark") 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_ARMBOX, test "$BOXTYPE" = "armbox")
AM_CONDITIONAL(BOXTYPE_MIPSBOX, test "$BOXTYPE" = "mipsbox") AM_CONDITIONAL(BOXTYPE_MIPSBOX, test "$BOXTYPE" = "mipsbox")

2
data/y-web/images/Makefile.am
View File

@@ -82,7 +82,7 @@ install_DATA = accept.png \
x_red.png \ x_red.png \
zap.png zap.png
if BOXTYPE_COOL if BOXTYPE_CST
install_DATA += rc_cst_v1.jpg \ install_DATA += rc_cst_v1.jpg \
rc_cst_v2.png \ rc_cst_v2.png \
rc_cst_v3.png \ rc_cst_v3.png \

2
lib/Makefile.am
View File

@@ -18,7 +18,7 @@ SUBDIRS += \
libupnpclient libupnpclient
endif endif
if BOXTYPE_COOL if BOXTYPE_CST
SUBDIRS += \ SUBDIRS += \
hardware/coolstream hardware/coolstream
endif endif

4
src/Makefile.am
View File

@@ -152,7 +152,7 @@ neutrino_LDADD += \
$(top_builddir)/lib/libupnpclient/libtuxbox-upnpclient.a $(top_builddir)/lib/libupnpclient/libtuxbox-upnpclient.a
endif endif
if BOXTYPE_COOL if BOXTYPE_CST
neutrino_LDADD += \ neutrino_LDADD += \
$(top_builddir)/lib/hardware/coolstream/libhwcaps.a $(top_builddir)/lib/hardware/coolstream/libhwcaps.a
if ENABLE_LIBCOOLSTREAM_STATIC if ENABLE_LIBCOOLSTREAM_STATIC
@@ -211,7 +211,7 @@ neutrino_LDADD += \
-L/opt/vc/lib/ -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt -L/opt/vc/lib/ -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt
endif endif
if BOXTYPE_COOL if BOXTYPE_CST
bin_PROGRAMS += shutdown_helper bin_PROGRAMS += shutdown_helper
shutdown_helper_SOURCES = shutdown_helper.c shutdown_helper_SOURCES = shutdown_helper.c
# if BOXMODEL_CS_HD2 # if BOXMODEL_CS_HD2

2
src/driver/Makefile.am
View File

@@ -56,7 +56,7 @@ libneutrino_driver_a_SOURCES += \
lcd4l.cpp lcd4l.cpp
endif endif
if BOXTYPE_COOL if BOXTYPE_CST
libneutrino_driver_a_SOURCES += \ libneutrino_driver_a_SOURCES += \
fb_accel_cs_hdx.cpp fb_accel_cs_hdx.cpp
if BOXMODEL_CST_HD2 if BOXMODEL_CST_HD2

2
src/gui/Makefile.am
View File

@@ -125,7 +125,7 @@ libneutrino_gui_a_SOURCES += \
glcdthemes.cpp glcdthemes.cpp
endif endif
if BOXTYPE_COOL if BOXTYPE_CST
libneutrino_gui_a_SOURCES += \ libneutrino_gui_a_SOURCES += \
streaminfo1.cpp streaminfo1.cpp
else else