diff --git a/configure.ac b/configure.ac index c73b0e3ac..05b1fde0b 100644 --- a/configure.ac +++ b/configure.ac @@ -151,6 +151,7 @@ if test "$BOXTYPE" != coolstream; then if test "$STB_HAL_INC" = ""; then AC_MSG_ERROR([need libstb-hal includes path with --with-stb-hal-includes=...]) fi + HWLIB_CFLAGS="-I$STB_HAL_INC" fi AC_ARG_ENABLE(cleanup, @@ -172,8 +173,10 @@ if test "$BOXTYPE" = "coolstream"; 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 header file.]) fi +HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream' if test "$BOXMODEL" = "apollo"; then +HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2' if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H,1,[Define to 1 if you have the header file.]) fi @@ -198,7 +201,7 @@ fi #*** libcoolstream $CSL_VERSION or newer is required! *** #]) #fi -AC_SUBST(LIBCS_CFLAGS) +AC_SUBST(HWLIB_CFLAGS) AC_SUBST(LIBCS_LIBS) AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_LIBS) diff --git a/lib/libdvbsub/Makefile.am b/lib/libdvbsub/Makefile.am index 1f910b413..1b1c86400 100644 --- a/lib/libdvbsub/Makefile.am +++ b/lib/libdvbsub/Makefile.am @@ -4,16 +4,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/zapit/include -if BOXTYPE_COOL -if BOXMODEL_APOLLO -AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2 -else -AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream -endif -endif -if USE_STB_HAL -AM_CPPFLAGS += -I$(STB_HAL_INC) -endif +AM_CPPFLAGS += @HWLIB_CFLAGS@ AM_CPPFLAGS += -fno-rtti -fno-exceptions diff --git a/lib/libtuxtxt/Makefile.am b/lib/libtuxtxt/Makefile.am index e3cb73260..c207800a3 100644 --- a/lib/libtuxtxt/Makefile.am +++ b/lib/libtuxtxt/Makefile.am @@ -7,17 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/zapit/include \ $(FREETYPE_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 USE_STB_HAL -AM_CPPFLAGS += -I$(STB_HAL_INC) -endif +AM_CPPFLAGS += @HWLIB_CFLAGS@ AM_CPPFLAGS += -fno-rtti -fno-exceptions diff --git a/src/Makefile.am b/src/Makefile.am index 5f59341a0..cee8abfd7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,18 +21,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/libmd5sum \ -I$(top_srcdir)/lib/libupnpclient \ @FREETYPE_CFLAGS@ \ - @LIBCS_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 USE_STB_HAL -AM_CPPFLAGS += -I$(STB_HAL_INC) -endif if BOXTYPE_TRIPLE SUBDIRS += lcddisplay endif diff --git a/src/daemonc/Makefile.am b/src/daemonc/Makefile.am index 04971ab12..e378ac2aa 100644 --- a/src/daemonc/Makefile.am +++ b/src/daemonc/Makefile.am @@ -10,18 +10,8 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libnet \ -I$(top_srcdir)/lib/xmltree \ - @FREETYPE_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 USE_STB_HAL -AM_CPPFLAGS += -I$(STB_HAL_INC) -endif + @FREETYPE_CFLAGS@ \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libneutrino_daemonc.a diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am index 7d398c347..e00a417b3 100644 --- a/src/driver/Makefile.am +++ b/src/driver/Makefile.am @@ -12,7 +12,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/connection \ -I$(top_srcdir)/lib/libeventserver \ - @FREETYPE_CFLAGS@ + @FREETYPE_CFLAGS@ \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libneutrino_driver.a libneutrino_driver_netfile.a @@ -45,11 +46,6 @@ if BOXTYPE_COOL libneutrino_driver_a_SOURCES += \ vfd.cpp -if BOXMODEL_APOLLO -AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2 -else -AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream -endif endif if BOXTYPE_TRIPLE libneutrino_driver_a_SOURCES += \ @@ -71,7 +67,6 @@ libneutrino_driver_a_SOURCES += \ endif if USE_STB_HAL AM_CPPFLAGS += \ - -I$(STB_HAL_INC) \ @DIRECTFB_CFLAGS@ endif diff --git a/src/driver/audiodec/Makefile.am b/src/driver/audiodec/Makefile.am index d72b969d8..6bfe9e451 100644 --- a/src/driver/audiodec/Makefile.am +++ b/src/driver/audiodec/Makefile.am @@ -9,18 +9,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/zapit/include \ -I$(top_srcdir)/lib/libconfigfile \ @FREETYPE_CFLAGS@ \ - @VORBISIDEC_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 USE_STB_HAL -AM_CPPFLAGS += -I$(STB_HAL_INC) -endif + @VORBISIDEC_CFLAGS@ \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libneutrino_driver_audiodec.a diff --git a/src/driver/pictureviewer/Makefile.am b/src/driver/pictureviewer/Makefile.am index 5d131ae24..6a7f7e935 100644 --- a/src/driver/pictureviewer/Makefile.am +++ b/src/driver/pictureviewer/Makefile.am @@ -7,18 +7,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/zapit/include \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/libconfigfile \ - @FREETYPE_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 USE_STB_HAL -AM_CPPFLAGS += -I$(STB_HAL_INC) -endif + @FREETYPE_CFLAGS@ \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libneutrino_pictureviewer.a diff --git a/src/eitd/Makefile.am b/src/eitd/Makefile.am index 7869b1b02..764ec0395 100644 --- a/src/eitd/Makefile.am +++ b/src/eitd/Makefile.am @@ -7,18 +7,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/connection \ -I$(top_srcdir)/lib/libeventserver \ - -I$(top_srcdir)/lib/xmltree - -if BOXTYPE_COOL -if BOXMODEL_APOLLO -AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2 -else -AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream -endif -endif -if USE_STB_HAL -AM_CPPFLAGS += -I$(STB_HAL_INC) -endif + -I$(top_srcdir)/lib/xmltree \ + @HWLIB_CFLAGS@ #AM_CPPFLAGS = AM_CPPFLAGS += -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 5cbed366e..df0f362c4 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -29,19 +29,8 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/lib/libupnpclient \ @CURL_CFLAGS@ \ @LUA_CFLAGS@ \ - @FREETYPE_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 USE_STB_HAL -AM_CPPFLAGS += -I$(STB_HAL_INC) -endif + @FREETYPE_CFLAGS@ \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libtimerlist.a libneutrino_gui.a libneutrino_gui2.a diff --git a/src/gui/bedit/Makefile.am b/src/gui/bedit/Makefile.am index bdc6f1e9b..ac6c1fded 100644 --- a/src/gui/bedit/Makefile.am +++ b/src/gui/bedit/Makefile.am @@ -9,18 +9,8 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/lib/libeventserver \ -I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/xmltree \ - @FREETYPE_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 USE_STB_HAL -AM_CPPFLAGS += -I$(STB_HAL_INC) -endif + @FREETYPE_CFLAGS@ \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libneutrino_gui_bedit.a diff --git a/src/gui/components/Makefile.am b/src/gui/components/Makefile.am index 4b4d26d01..f54eae886 100644 --- a/src/gui/components/Makefile.am +++ b/src/gui/components/Makefile.am @@ -9,19 +9,8 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/lib/libeventserver \ -I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/xmltree \ - @FREETYPE_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 USE_STB_HAL -AM_CPPFLAGS += -I$(STB_HAL_INC) -endif + @FREETYPE_CFLAGS@ \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libneutrino_gui_components.a diff --git a/src/gui/widget/Makefile.am b/src/gui/widget/Makefile.am index 44941a6fd..42c3bb830 100644 --- a/src/gui/widget/Makefile.am +++ b/src/gui/widget/Makefile.am @@ -8,18 +8,8 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/libnet \ -I$(top_srcdir)/lib/libconfigfile \ - @FREETYPE_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 USE_STB_HAL -AM_CPPFLAGS += -I$(STB_HAL_INC) -endif + @FREETYPE_CFLAGS@ \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libneutrino_gui_widget.a libneutrino_gui_widget2.a diff --git a/src/nhttpd/tuxboxapi/coolstream/Makefile.am b/src/nhttpd/tuxboxapi/coolstream/Makefile.am index 77bba00a5..51687bded 100644 --- a/src/nhttpd/tuxboxapi/coolstream/Makefile.am +++ b/src/nhttpd/tuxboxapi/coolstream/Makefile.am @@ -13,18 +13,8 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/lib/libeventserver \ -I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/xmltree \ - @FREETYPE_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 USE_STB_HAL -AM_CPPFLAGS += -I$(STB_HAL_INC) -endif + @FREETYPE_CFLAGS@ \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libnhttpd_tuxboxapi.a diff --git a/src/nhttpd/yhttpd_core/Makefile.am b/src/nhttpd/yhttpd_core/Makefile.am index e162d8adf..ce6e5165f 100644 --- a/src/nhttpd/yhttpd_core/Makefile.am +++ b/src/nhttpd/yhttpd_core/Makefile.am @@ -9,19 +9,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/connection \ -I$(top_srcdir)/lib/libeventserver \ -I$(top_srcdir)/lib/libconfigfile \ - @FREETYPE_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 USE_STB_HAL -AM_CPPFLAGS += -I$(STB_HAL_INC) -endif + @FREETYPE_CFLAGS@ \ + @HWLIB_CFLAGS@ AM_CPPFLAGS += -fno-rtti -fno-exceptions diff --git a/src/system/Makefile.am b/src/system/Makefile.am index ae0f114b1..2a180dc17 100644 --- a/src/system/Makefile.am +++ b/src/system/Makefile.am @@ -16,18 +16,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libmd5sum \ -I$(top_srcdir)/lib/xmltree \ - @FREETYPE_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 USE_STB_HAL -AM_CPPFLAGS += -I$(STB_HAL_INC) -endif + @FREETYPE_CFLAGS@ \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libneutrino_system.a diff --git a/src/system/mtdutils/Makefile.am b/src/system/mtdutils/Makefile.am index c8486d75d..42426fee2 100644 --- a/src/system/mtdutils/Makefile.am +++ b/src/system/mtdutils/Makefile.am @@ -15,13 +15,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/libmd5sum \ -I$(top_srcdir)/lib/xmltree \ -I$(top_srcdir)/src/system/mtdutils/include - @FREETYPE_CFLAGS@ - -if BOXMODEL_APOLLO -AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2 -else -AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream -endif + @FREETYPE_CFLAGS@ \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libneutrino_system_mtdutils.a diff --git a/src/zapit/src/Makefile.am b/src/zapit/src/Makefile.am index 0d086e4a1..9887883df 100644 --- a/src/zapit/src/Makefile.am +++ b/src/zapit/src/Makefile.am @@ -9,19 +9,8 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/connection \ -I$(top_srcdir)/lib/libeventserver \ - -I$(top_srcdir)/lib/xmltree - -if BOXTYPE_COOL -if BOXMODEL_APOLLO -AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2 -else -AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream -endif -endif - -if USE_STB_HAL -AM_CPPFLAGS += -I$(STB_HAL_INC) -endif + -I$(top_srcdir)/lib/xmltree \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libzapit.a