diff --git a/configure.ac b/configure.ac index 01ce01d16..c127e9e9f 100644 --- a/configure.ac +++ b/configure.ac @@ -212,6 +212,7 @@ 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 -I$(top_srcdir)/src/zapit/include/private' if test "$BOXMODEL" = "apollo"; 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 AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H,1,[Define to 1 if you have the header file.]) fi +HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2 -I$(top_srcdir)/src/zapit/include/private' fi fi @@ -238,6 +240,7 @@ fi #*** libcoolstream $CSL_VERSION or newer is required! *** #]) #fi +AC_SUBST(HWLIB_CFLAGS) AC_SUBST(LIBCS_CFLAGS) AC_SUBST(LIBCS_LIBS) AC_SUBST(FREETYPE_CFLAGS) diff --git a/lib/libdvbsub/Makefile.am b/lib/libdvbsub/Makefile.am index 16b351cc9..6ac627d08 100644 --- a/lib/libdvbsub/Makefile.am +++ b/lib/libdvbsub/Makefile.am @@ -2,18 +2,9 @@ AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -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 BOXTYPE_TRIPLE -AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple -endif + -I$(top_srcdir)/src/zapit/include \ + @AVFORMAT_CFLAGS@ \ + @HWLIB_CFLAGS@ AM_CPPFLAGS += -fno-rtti -fno-exceptions diff --git a/lib/libtuxtxt/Makefile.am b/lib/libtuxtxt/Makefile.am index f88bc9847..7ea232ad1 100644 --- a/lib/libtuxtxt/Makefile.am +++ b/lib/libtuxtxt/Makefile.am @@ -3,19 +3,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/src \ -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 BOXTYPE_TRIPLE -AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple -endif + $(FREETYPE_CFLAGS) \ + @HWLIB_CFLAGS@ AM_CPPFLAGS += -fno-rtti -fno-exceptions diff --git a/src/Makefile.am b/src/Makefile.am index aa3a38a24..1a30813fc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,18 +22,12 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/libupnpclient \ @SIGC_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 SUBDIRS += lcddisplay -AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple endif if USE_PUGIXML diff --git a/src/daemonc/Makefile.am b/src/daemonc/Makefile.am index a92b6c3a2..c272b2dee 100644 --- a/src/daemonc/Makefile.am +++ b/src/daemonc/Makefile.am @@ -11,18 +11,10 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/lib/libnet \ -I$(top_srcdir)/lib/xmltree \ @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 diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am index e2fc4e41f..965e9083d 100644 --- a/src/driver/Makefile.am +++ b/src/driver/Makefile.am @@ -13,7 +13,9 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/connection \ -I$(top_srcdir)/lib/libeventserver \ @SIGC_CFLAGS@ \ - @FREETYPE_CFLAGS@ + @FREETYPE_CFLAGS@ \ + @AVFORMAT_CFLAGS@ \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libneutrino_driver.a libneutrino_driver_netfile.a @@ -45,21 +47,12 @@ libneutrino_driver_a_SOURCES = \ if BOXTYPE_COOL libneutrino_driver_a_SOURCES += \ 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 libneutrino_driver_a_SOURCES += \ newclock.cpp \ lcdd.cpp - -AM_CPPFLAGS += \ - -I$(top_srcdir)/lib/libtriple endif libneutrino_driver_netfile_a_SOURCES = netfile.cpp - diff --git a/src/driver/audiodec/Makefile.am b/src/driver/audiodec/Makefile.am index fe5d01c74..eccc74b27 100644 --- a/src/driver/audiodec/Makefile.am +++ b/src/driver/audiodec/Makefile.am @@ -9,18 +9,9 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/zapit/include \ -I$(top_srcdir)/lib/libconfigfile \ @SIGC_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 BOXTYPE_TRIPLE -AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple -endif + @FREETYPE_CFLAGS@ \ + @AVFORMAT_CFLAGS@ \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libneutrino_driver_audiodec.a diff --git a/src/driver/pictureviewer/Makefile.am b/src/driver/pictureviewer/Makefile.am index 8ea1ba760..bff7f879e 100644 --- a/src/driver/pictureviewer/Makefile.am +++ b/src/driver/pictureviewer/Makefile.am @@ -8,18 +8,9 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/libconfigfile \ @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 diff --git a/src/eitd/Makefile.am b/src/eitd/Makefile.am index e98b87194..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 BOXTYPE_TRIPLE -AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple -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 fb5f20e78..73c963593 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -34,19 +34,9 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/lib/libupnpclient \ @SIGC_CFLAGS@ \ @CURL_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 BOXTYPE_TRIPLE -AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple -endif + @FREETYPE_CFLAGS@ \ + @AVFORMAT_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 c161a849c..1aaed9a3d 100644 --- a/src/gui/bedit/Makefile.am +++ b/src/gui/bedit/Makefile.am @@ -10,15 +10,8 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/xmltree \ @SIGC_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 + @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 7f855cf03..0089ac8a1 100644 --- a/src/gui/components/Makefile.am +++ b/src/gui/components/Makefile.am @@ -10,16 +10,8 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/xmltree \ @SIGC_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 - + @FREETYPE_CFLAGS@ \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libneutrino_gui_components.a diff --git a/src/gui/lua/Makefile.am b/src/gui/lua/Makefile.am index 5846d094c..eab73c11d 100644 --- a/src/gui/lua/Makefile.am +++ b/src/gui/lua/Makefile.am @@ -16,15 +16,9 @@ AM_CPPFLAGS += \ @SIGC_CFLAGS@ \ @CURL_CFLAGS@ \ @FREETYPE_CFLAGS@ \ - @LUA_CFLAGS@ - -if BOXTYPE_COOL -if BOXMODEL_APOLLO -AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2 -else -AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream -endif -endif + @LUA_CFLAGS@ \ + @AVFORMAT_CFLAGS@ \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libneutrino_gui_lua.a diff --git a/src/gui/widget/Makefile.am b/src/gui/widget/Makefile.am index 60ad5ba8f..ea77f8b29 100644 --- a/src/gui/widget/Makefile.am +++ b/src/gui/widget/Makefile.am @@ -9,19 +9,8 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/lib/libnet \ -I$(top_srcdir)/lib/libconfigfile \ @SIGC_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 BOXTYPE_TRIPLE -AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple -endif + @FREETYPE_CFLAGS@ \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libneutrino_gui_widget.a libneutrino_gui_widget2.a diff --git a/src/lcddisplay/Makefile.am b/src/lcddisplay/Makefile.am index b21bf8cbf..fe66146cf 100644 --- a/src/lcddisplay/Makefile.am +++ b/src/lcddisplay/Makefile.am @@ -2,6 +2,9 @@ noinst_LIBRARIES = liblcddisplay.a liblcddisplay_a_SOURCES = lcddisplay.cpp fontrenderer.cpp +AM_CPPFLAGS = \ + -I$(top_builddir) + AM_CXXFLAGS = \ @FREETYPE_CFLAGS@ \ @PNG_CFLAGS@ diff --git a/src/nhttpd/tuxboxapi/Makefile.am b/src/nhttpd/tuxboxapi/Makefile.am index 6f30cdb4a..f208f7b02 100644 --- a/src/nhttpd/tuxboxapi/Makefile.am +++ b/src/nhttpd/tuxboxapi/Makefile.am @@ -14,18 +14,9 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/xmltree \ @SIGC_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 BOXTYPE_TRIPLE -AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple -endif + @FREETYPE_CFLAGS@ \ + @AVFORMAT_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 948eae513..5d95d0e77 100644 --- a/src/nhttpd/yhttpd_core/Makefile.am +++ b/src/nhttpd/yhttpd_core/Makefile.am @@ -9,15 +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 + @FREETYPE_CFLAGS@ \ + @HWLIB_CFLAGS@ AM_CPPFLAGS += -fno-rtti -fno-exceptions -D_FILE_OFFSET_BITS=64 diff --git a/src/system/Makefile.am b/src/system/Makefile.am index 37c20cb21..c0c5df8eb 100644 --- a/src/system/Makefile.am +++ b/src/system/Makefile.am @@ -18,18 +18,9 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/xmltree \ -I$(top_srcdir)/lib/jsoncpp/include \ @SIGC_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 BOXTYPE_TRIPLE -AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple -endif + @FREETYPE_CFLAGS@ \ + @AVFORMAT_CFLAGS@ \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libneutrino_system.a diff --git a/src/system/mtdutils/Makefile.am b/src/system/mtdutils/Makefile.am index 0749acd62..a95d77890 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/timerd/Makefile.am b/src/timerd/Makefile.am index c3b397da7..4bbe89fa6 100644 --- a/src/timerd/Makefile.am +++ b/src/timerd/Makefile.am @@ -9,7 +9,8 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/connection \ -I$(top_srcdir)/lib/libeventserver \ - -I$(top_srcdir)/lib/xmltree + -I$(top_srcdir)/lib/xmltree \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libtimerd.a diff --git a/src/zapit/src/Makefile.am b/src/zapit/src/Makefile.am index f010bd71d..9ece8df27 100644 --- a/src/zapit/src/Makefile.am +++ b/src/zapit/src/Makefile.am @@ -9,18 +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 BOXTYPE_TRIPLE -AM_CPPFLAGS += -I$(top_srcdir)/lib/libtriple -endif + -I$(top_srcdir)/lib/xmltree \ + @HWLIB_CFLAGS@ noinst_LIBRARIES = libzapit.a