- port HWLIB_CFLAGS from neutrino-mp to neutrino-hd

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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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@

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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