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

- port HWLIB_CFLAGS from neutrino-mp to neutrino-hd

Browse Source
This commit is contained in:
Stefan Seyfried
2016-01-12 10:30:14 +01:00
committed by svenhoefer
parent 73b5303cfc
commit 79d800f955
21 changed files with 54 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@@ -212,6 +212,7 @@ if test "$BOXTYPE" = "coolstream"; then
if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then
AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H,1,[Define to 1 if you have the <nevis_ir.h> header file.]) AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H,1,[Define to 1 if you have the <nevis_ir.h> header file.])
fi fi
HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream -I$(top_srcdir)/src/zapit/include/private'
if test "$BOXMODEL" = "apollo"; then if test "$BOXMODEL" = "apollo"; then
if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then
@@ -220,6 +221,7 @@ fi
if test -e ${srcdir}/lib/libcoolstream2/cs_frontpanel.h; then if test -e ${srcdir}/lib/libcoolstream2/cs_frontpanel.h; then
AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H,1,[Define to 1 if you have the <cs_frontpanel.h> header file.]) AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H,1,[Define to 1 if you have the <cs_frontpanel.h> header file.])
fi fi
HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2 -I$(top_srcdir)/src/zapit/include/private'
fi fi
fi fi
@@ -238,6 +240,7 @@ fi
#*** libcoolstream $CSL_VERSION or newer is required! *** #*** libcoolstream $CSL_VERSION or newer is required! ***
#]) #])
#fi #fi
AC_SUBST(HWLIB_CFLAGS)
AC_SUBST(LIBCS_CFLAGS) AC_SUBST(LIBCS_CFLAGS)
AC_SUBST(LIBCS_LIBS) AC_SUBST(LIBCS_LIBS)
AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_CFLAGS)

15
lib/libdvbsub/Makefile.am
View File

@@ -2,18 +2,9 @@ AM_CPPFLAGS = \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/zapit/include -I$(top_srcdir)/src/zapit/include \
@AVFORMAT_CFLAGS@ \
if BOXTYPE_COOL @HWLIB_CFLAGS@
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple
endif
AM_CPPFLAGS += -fno-rtti -fno-exceptions AM_CPPFLAGS += -fno-rtti -fno-exceptions

15
lib/libtuxtxt/Makefile.am
View File

@@ -3,19 +3,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/zapit/include \ -I$(top_srcdir)/src/zapit/include \
$(FREETYPE_CFLAGS) $(FREETYPE_CFLAGS) \
@HWLIB_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple
endif
AM_CPPFLAGS += -fno-rtti -fno-exceptions AM_CPPFLAGS += -fno-rtti -fno-exceptions

12
src/Makefile.am
View File

@@ -22,18 +22,12 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/libupnpclient \ -I$(top_srcdir)/lib/libupnpclient \
@SIGC_CFLAGS@ \ @SIGC_CFLAGS@ \
@FREETYPE_CFLAGS@ \ @FREETYPE_CFLAGS@ \
@LIBCS_CFLAGS@ @LIBCS_CFLAGS@ \
@AVFORMAT_CFLAGS@ \
@HWLIB_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE if BOXTYPE_TRIPLE
SUBDIRS += lcddisplay SUBDIRS += lcddisplay
AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple
endif endif
if USE_PUGIXML if USE_PUGIXML

14
src/daemonc/Makefile.am
View File

@@ -11,18 +11,10 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib/libnet \ -I$(top_srcdir)/lib/libnet \
-I$(top_srcdir)/lib/xmltree \ -I$(top_srcdir)/lib/xmltree \
@SIGC_CFLAGS@ \ @SIGC_CFLAGS@ \
@FREETYPE_CFLAGS@ @FREETYPE_CFLAGS@ \
@AVFORMAT_CFLAGS@ \
@HWLIB_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple
endif
noinst_LIBRARIES = libneutrino_daemonc.a noinst_LIBRARIES = libneutrino_daemonc.a

15
src/driver/Makefile.am
View File

@@ -13,7 +13,9 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/connection \ -I$(top_srcdir)/lib/connection \
-I$(top_srcdir)/lib/libeventserver \ -I$(top_srcdir)/lib/libeventserver \
@SIGC_CFLAGS@ \ @SIGC_CFLAGS@ \
@FREETYPE_CFLAGS@ @FREETYPE_CFLAGS@ \
@AVFORMAT_CFLAGS@ \
@HWLIB_CFLAGS@
noinst_LIBRARIES = libneutrino_driver.a libneutrino_driver_netfile.a noinst_LIBRARIES = libneutrino_driver.a libneutrino_driver_netfile.a
@@ -45,21 +47,12 @@ libneutrino_driver_a_SOURCES = \
if BOXTYPE_COOL if BOXTYPE_COOL
libneutrino_driver_a_SOURCES += \ libneutrino_driver_a_SOURCES += \
vfd.cpp vfd.cpp
endif
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE if BOXTYPE_TRIPLE
libneutrino_driver_a_SOURCES += \ libneutrino_driver_a_SOURCES += \
newclock.cpp \ newclock.cpp \
lcdd.cpp lcdd.cpp
AM_CPPFLAGS += \
-I$(top_srcdir)/lib/libtriple
endif endif
libneutrino_driver_netfile_a_SOURCES = netfile.cpp libneutrino_driver_netfile_a_SOURCES = netfile.cpp

15
src/driver/audiodec/Makefile.am
View File

@@ -9,18 +9,9 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/zapit/include \ -I$(top_srcdir)/src/zapit/include \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
@SIGC_CFLAGS@ \ @SIGC_CFLAGS@ \
@FREETYPE_CFLAGS@ @FREETYPE_CFLAGS@ \
@AVFORMAT_CFLAGS@ \
if BOXTYPE_COOL @HWLIB_CFLAGS@
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple
endif
noinst_LIBRARIES = libneutrino_driver_audiodec.a noinst_LIBRARIES = libneutrino_driver_audiodec.a

13
src/driver/pictureviewer/Makefile.am
View File

@@ -8,18 +8,9 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
@SIGC_CFLAGS@ \ @SIGC_CFLAGS@ \
@FREETYPE_CFLAGS@ @FREETYPE_CFLAGS@ \
@HWLIB_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple
endif
noinst_LIBRARIES = libneutrino_pictureviewer.a noinst_LIBRARIES = libneutrino_pictureviewer.a

14
src/eitd/Makefile.am
View File

@@ -7,18 +7,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/connection \ -I$(top_srcdir)/lib/connection \
-I$(top_srcdir)/lib/libeventserver \ -I$(top_srcdir)/lib/libeventserver \
-I$(top_srcdir)/lib/xmltree -I$(top_srcdir)/lib/xmltree \
@HWLIB_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple
endif
#AM_CPPFLAGS = #AM_CPPFLAGS =
AM_CPPFLAGS += -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS AM_CPPFLAGS += -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS

16
src/gui/Makefile.am
View File

@@ -34,19 +34,9 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib/libupnpclient \ -I$(top_srcdir)/lib/libupnpclient \
@SIGC_CFLAGS@ \ @SIGC_CFLAGS@ \
@CURL_CFLAGS@ \ @CURL_CFLAGS@ \
@FREETYPE_CFLAGS@ @FREETYPE_CFLAGS@ \
@AVFORMAT_CFLAGS@ \
if BOXTYPE_COOL @HWLIB_CFLAGS@
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple
endif
noinst_LIBRARIES = libtimerlist.a libneutrino_gui.a libneutrino_gui2.a noinst_LIBRARIES = libtimerlist.a libneutrino_gui.a libneutrino_gui2.a

11
src/gui/bedit/Makefile.am
View File

@@ -10,15 +10,8 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/xmltree \ -I$(top_srcdir)/lib/xmltree \
@SIGC_CFLAGS@ \ @SIGC_CFLAGS@ \
@FREETYPE_CFLAGS@ @FREETYPE_CFLAGS@ \
@HWLIB_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
noinst_LIBRARIES = libneutrino_gui_bedit.a noinst_LIBRARIES = libneutrino_gui_bedit.a

12
src/gui/components/Makefile.am
View File

@@ -10,16 +10,8 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/xmltree \ -I$(top_srcdir)/lib/xmltree \
@SIGC_CFLAGS@ \ @SIGC_CFLAGS@ \
@FREETYPE_CFLAGS@ @FREETYPE_CFLAGS@ \
@HWLIB_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
noinst_LIBRARIES = libneutrino_gui_components.a noinst_LIBRARIES = libneutrino_gui_components.a

12
src/gui/lua/Makefile.am
View File

@@ -16,15 +16,9 @@ AM_CPPFLAGS += \
@SIGC_CFLAGS@ \ @SIGC_CFLAGS@ \
@CURL_CFLAGS@ \ @CURL_CFLAGS@ \
@FREETYPE_CFLAGS@ \ @FREETYPE_CFLAGS@ \
@LUA_CFLAGS@ @LUA_CFLAGS@ \
@AVFORMAT_CFLAGS@ \
if BOXTYPE_COOL @HWLIB_CFLAGS@
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
noinst_LIBRARIES = libneutrino_gui_lua.a noinst_LIBRARIES = libneutrino_gui_lua.a

15
src/gui/widget/Makefile.am
View File

@@ -9,19 +9,8 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib/libnet \ -I$(top_srcdir)/lib/libnet \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
@SIGC_CFLAGS@ \ @SIGC_CFLAGS@ \
@FREETYPE_CFLAGS@ @FREETYPE_CFLAGS@ \
@HWLIB_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple
endif
noinst_LIBRARIES = libneutrino_gui_widget.a libneutrino_gui_widget2.a noinst_LIBRARIES = libneutrino_gui_widget.a libneutrino_gui_widget2.a

3
src/lcddisplay/Makefile.am
View File

@@ -2,6 +2,9 @@ noinst_LIBRARIES = liblcddisplay.a
liblcddisplay_a_SOURCES = lcddisplay.cpp fontrenderer.cpp liblcddisplay_a_SOURCES = lcddisplay.cpp fontrenderer.cpp
AM_CPPFLAGS = \
-I$(top_builddir)
AM_CXXFLAGS = \ AM_CXXFLAGS = \
@FREETYPE_CFLAGS@ \ @FREETYPE_CFLAGS@ \
@PNG_CFLAGS@ @PNG_CFLAGS@

15
src/nhttpd/tuxboxapi/Makefile.am
View File

@@ -14,18 +14,9 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/xmltree \ -I$(top_srcdir)/lib/xmltree \
@SIGC_CFLAGS@ \ @SIGC_CFLAGS@ \
@FREETYPE_CFLAGS@ @FREETYPE_CFLAGS@ \
@AVFORMAT_CFLAGS@ \
if BOXTYPE_COOL @HWLIB_CFLAGS@
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple
endif
noinst_LIBRARIES = libnhttpd_tuxboxapi.a noinst_LIBRARIES = libnhttpd_tuxboxapi.a

11
src/nhttpd/yhttpd_core/Makefile.am
View File

@@ -9,15 +9,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/connection \ -I$(top_srcdir)/lib/connection \
-I$(top_srcdir)/lib/libeventserver \ -I$(top_srcdir)/lib/libeventserver \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
@FREETYPE_CFLAGS@ @FREETYPE_CFLAGS@ \
@HWLIB_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
AM_CPPFLAGS += -fno-rtti -fno-exceptions -D_FILE_OFFSET_BITS=64 AM_CPPFLAGS += -fno-rtti -fno-exceptions -D_FILE_OFFSET_BITS=64

15
src/system/Makefile.am
View File

@@ -18,18 +18,9 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/xmltree \ -I$(top_srcdir)/lib/xmltree \
-I$(top_srcdir)/lib/jsoncpp/include \ -I$(top_srcdir)/lib/jsoncpp/include \
@SIGC_CFLAGS@ \ @SIGC_CFLAGS@ \
@FREETYPE_CFLAGS@ @FREETYPE_CFLAGS@ \
@AVFORMAT_CFLAGS@ \
if BOXTYPE_COOL @HWLIB_CFLAGS@
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple
endif
noinst_LIBRARIES = libneutrino_system.a noinst_LIBRARIES = libneutrino_system.a

9
src/system/mtdutils/Makefile.am
View File

@@ -15,13 +15,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/libmd5sum \ -I$(top_srcdir)/lib/libmd5sum \
-I$(top_srcdir)/lib/xmltree \ -I$(top_srcdir)/lib/xmltree \
-I$(top_srcdir)/src/system/mtdutils/include \ -I$(top_srcdir)/src/system/mtdutils/include \
@FREETYPE_CFLAGS@ @FREETYPE_CFLAGS@ \
@HWLIB_CFLAGS@
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
noinst_LIBRARIES = libneutrino_system_mtdutils.a noinst_LIBRARIES = libneutrino_system_mtdutils.a

3
src/timerd/Makefile.am
View File

@@ -9,7 +9,8 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/connection \ -I$(top_srcdir)/lib/connection \
-I$(top_srcdir)/lib/libeventserver \ -I$(top_srcdir)/lib/libeventserver \
-I$(top_srcdir)/lib/xmltree -I$(top_srcdir)/lib/xmltree \
@HWLIB_CFLAGS@
noinst_LIBRARIES = libtimerd.a noinst_LIBRARIES = libtimerd.a

14
src/zapit/src/Makefile.am
View File

@@ -9,18 +9,8 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/connection \ -I$(top_srcdir)/lib/connection \
-I$(top_srcdir)/lib/libeventserver \ -I$(top_srcdir)/lib/libeventserver \
-I$(top_srcdir)/lib/xmltree -I$(top_srcdir)/lib/xmltree \
@HWLIB_CFLAGS@
if BOXTYPE_COOL
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif
if BOXTYPE_TRIPLE
AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple
endif
noinst_LIBRARIES = libzapit.a noinst_LIBRARIES = libzapit.a