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

Makefiles: simplify includes for libcoolstream/libstb-hal

Browse Source
This commit is contained in:
Stefan Seyfried
2013-11-11 21:51:08 +01:00
parent 490a6a604b
commit 3a728f9ee1
18 changed files with 35 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@@ -151,6 +151,7 @@ if test "$BOXTYPE" != coolstream; then
if test "$STB_HAL_INC" = ""; then if test "$STB_HAL_INC" = ""; then
AC_MSG_ERROR([need libstb-hal includes path with --with-stb-hal-includes=...]) AC_MSG_ERROR([need libstb-hal includes path with --with-stb-hal-includes=...])
fi fi
HWLIB_CFLAGS="-I$STB_HAL_INC"
fi fi
AC_ARG_ENABLE(cleanup, AC_ARG_ENABLE(cleanup,
@@ -172,8 +173,10 @@ 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'
if test "$BOXMODEL" = "apollo"; then if test "$BOXMODEL" = "apollo"; then
HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2'
if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then 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 <cs_ir_generic.h> header file.]) AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H,1,[Define to 1 if you have the <cs_ir_generic.h> header file.])
fi fi
@@ -198,7 +201,7 @@ fi
#*** libcoolstream $CSL_VERSION or newer is required! *** #*** libcoolstream $CSL_VERSION or newer is required! ***
#]) #])
#fi #fi
AC_SUBST(LIBCS_CFLAGS) AC_SUBST(HWLIB_CFLAGS)
AC_SUBST(LIBCS_LIBS) AC_SUBST(LIBCS_LIBS)
AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_CFLAGS)
AC_SUBST(FREETYPE_LIBS) AC_SUBST(FREETYPE_LIBS)

11
lib/libdvbsub/Makefile.am
View File

@@ -4,16 +4,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/zapit/include -I$(top_srcdir)/src/zapit/include
if BOXTYPE_COOL AM_CPPFLAGS += @HWLIB_CFLAGS@
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 += -fno-rtti -fno-exceptions AM_CPPFLAGS += -fno-rtti -fno-exceptions

12
lib/libtuxtxt/Makefile.am
View File

@@ -7,17 +7,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/zapit/include \ -I$(top_srcdir)/src/zapit/include \
$(FREETYPE_CFLAGS) $(FREETYPE_CFLAGS)
if BOXTYPE_COOL AM_CPPFLAGS += @HWLIB_CFLAGS@
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 += -fno-rtti -fno-exceptions AM_CPPFLAGS += -fno-rtti -fno-exceptions

12
src/Makefile.am
View File

@@ -21,18 +21,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/libmd5sum \ -I$(top_srcdir)/lib/libmd5sum \
-I$(top_srcdir)/lib/libupnpclient \ -I$(top_srcdir)/lib/libupnpclient \
@FREETYPE_CFLAGS@ \ @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 if BOXTYPE_TRIPLE
SUBDIRS += lcddisplay SUBDIRS += lcddisplay
endif endif

14
src/daemonc/Makefile.am
View File

@@ -10,18 +10,8 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/libnet \ -I$(top_srcdir)/lib/libnet \
-I$(top_srcdir)/lib/xmltree \ -I$(top_srcdir)/lib/xmltree \
@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 USE_STB_HAL
AM_CPPFLAGS += -I$(STB_HAL_INC)
endif
noinst_LIBRARIES = libneutrino_daemonc.a noinst_LIBRARIES = libneutrino_daemonc.a

9
src/driver/Makefile.am
View File

@@ -12,7 +12,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 \
@FREETYPE_CFLAGS@ @FREETYPE_CFLAGS@ \
@HWLIB_CFLAGS@
noinst_LIBRARIES = libneutrino_driver.a libneutrino_driver_netfile.a noinst_LIBRARIES = libneutrino_driver.a libneutrino_driver_netfile.a
@@ -45,11 +46,6 @@ if BOXTYPE_COOL
libneutrino_driver_a_SOURCES += \ libneutrino_driver_a_SOURCES += \
vfd.cpp vfd.cpp
if BOXMODEL_APOLLO
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
else
AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
endif
endif endif
if BOXTYPE_TRIPLE if BOXTYPE_TRIPLE
libneutrino_driver_a_SOURCES += \ libneutrino_driver_a_SOURCES += \
@@ -71,7 +67,6 @@ libneutrino_driver_a_SOURCES += \
endif endif
if USE_STB_HAL if USE_STB_HAL
AM_CPPFLAGS += \ AM_CPPFLAGS += \
-I$(STB_HAL_INC) \
@DIRECTFB_CFLAGS@ @DIRECTFB_CFLAGS@
endif endif

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

@@ -9,18 +9,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/zapit/include \ -I$(top_srcdir)/src/zapit/include \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
@FREETYPE_CFLAGS@ \ @FREETYPE_CFLAGS@ \
@VORBISIDEC_CFLAGS@ @VORBISIDEC_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
noinst_LIBRARIES = libneutrino_driver_audiodec.a noinst_LIBRARIES = libneutrino_driver_audiodec.a

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

@@ -7,18 +7,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/zapit/include \ -I$(top_srcdir)/src/zapit/include \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
-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
if USE_STB_HAL
AM_CPPFLAGS += -I$(STB_HAL_INC)
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 USE_STB_HAL
AM_CPPFLAGS += -I$(STB_HAL_INC)
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

15
src/gui/Makefile.am
View File

@@ -29,19 +29,8 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib/libupnpclient \ -I$(top_srcdir)/lib/libupnpclient \
@CURL_CFLAGS@ \ @CURL_CFLAGS@ \
@LUA_CFLAGS@ \ @LUA_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 USE_STB_HAL
AM_CPPFLAGS += -I$(STB_HAL_INC)
endif
noinst_LIBRARIES = libtimerlist.a libneutrino_gui.a libneutrino_gui2.a noinst_LIBRARIES = libtimerlist.a libneutrino_gui.a libneutrino_gui2.a

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

@@ -9,18 +9,8 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib/libeventserver \ -I$(top_srcdir)/lib/libeventserver \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/xmltree \ -I$(top_srcdir)/lib/xmltree \
@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 USE_STB_HAL
AM_CPPFLAGS += -I$(STB_HAL_INC)
endif
noinst_LIBRARIES = libneutrino_gui_bedit.a noinst_LIBRARIES = libneutrino_gui_bedit.a

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

@@ -9,19 +9,8 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib/libeventserver \ -I$(top_srcdir)/lib/libeventserver \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/xmltree \ -I$(top_srcdir)/lib/xmltree \
@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 USE_STB_HAL
AM_CPPFLAGS += -I$(STB_HAL_INC)
endif
noinst_LIBRARIES = libneutrino_gui_components.a noinst_LIBRARIES = libneutrino_gui_components.a

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

@@ -8,18 +8,8 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/libnet \ -I$(top_srcdir)/lib/libnet \
-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
if USE_STB_HAL
AM_CPPFLAGS += -I$(STB_HAL_INC)
endif
noinst_LIBRARIES = libneutrino_gui_widget.a libneutrino_gui_widget2.a noinst_LIBRARIES = libneutrino_gui_widget.a libneutrino_gui_widget2.a

14
src/nhttpd/tuxboxapi/coolstream/Makefile.am
View File

@@ -13,18 +13,8 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib/libeventserver \ -I$(top_srcdir)/lib/libeventserver \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/xmltree \ -I$(top_srcdir)/lib/xmltree \
@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 USE_STB_HAL
AM_CPPFLAGS += -I$(STB_HAL_INC)
endif
noinst_LIBRARIES = libnhttpd_tuxboxapi.a noinst_LIBRARIES = libnhttpd_tuxboxapi.a

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

@@ -9,19 +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
if USE_STB_HAL
AM_CPPFLAGS += -I$(STB_HAL_INC)
endif
AM_CPPFLAGS += -fno-rtti -fno-exceptions AM_CPPFLAGS += -fno-rtti -fno-exceptions

14
src/system/Makefile.am
View File

@@ -16,18 +16,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/libconfigfile \ -I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/libmd5sum \ -I$(top_srcdir)/lib/libmd5sum \
-I$(top_srcdir)/lib/xmltree \ -I$(top_srcdir)/lib/xmltree \
@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 USE_STB_HAL
AM_CPPFLAGS += -I$(STB_HAL_INC)
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

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

@@ -9,19 +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 USE_STB_HAL
AM_CPPFLAGS += -I$(STB_HAL_INC)
endif
noinst_LIBRARIES = libzapit.a noinst_LIBRARIES = libzapit.a