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

use the correct include path to the private headers

Browse Source 
...and make sure they are actally used everywhere
This is the correct fix for 2e5446ad9f
This commit is contained in:
Stefan Seyfried
2015-01-28 20:53:58 +01:00
parent bcc38b9b4d
commit 35c331de69
6 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -231,10 +231,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 <nevis_ir.h> header file.])
fi
HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream -I$(top_srcdir)/zapit/include/private'
HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream -I$(top_srcdir)/src/zapit/include/private'
if test "$BOXMODEL" = "apollo"; then
HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2 -I$(top_srcdir)/zapit/include/private'
HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2 -I$(top_srcdir)/src/zapit/include/private'
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.])
fi

1
lib/sectionsdclient/Makefile.am
View File

@@ -1,4 +1,5 @@
AM_CPPFLAGS = \
@HWLIB_CFLAGS@ \
-I$(top_builddir) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/src/zapit/include \

1
lib/timerdclient/Makefile.am
View File

@@ -1,4 +1,5 @@
AM_CPPFLAGS = \
@HWLIB_CFLAGS@ \
-I$(top_builddir) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/src/zapit/include \

3
src/nhttpd/Makefile.am
View File

@@ -3,6 +3,7 @@ SUBDIRS = yhttpd_core yhttpd_mods tuxboxapi web
AM_CPPFLAGS = -fno-rtti -fno-exceptions -D_FILE_OFFSET_BITS=64
AM_CPPFLAGS += \
@HWLIB_CFLAGS@ \
-I$(srcdir) \
-I$(top_builddir) \
-I$(top_srcdir) \
@@ -24,4 +25,4 @@ libnhttpd_a_SOURCES = yhttpd.cpp
libnhttpd_adir = @CONFIGDIR@
libnhttpd_a_DATA = nhttpd.conf
EXTRA_DIST = nhttpd.conf nhttpd.conf.in
EXTRA_DIST = nhttpd.conf nhttpd.conf.in

1
src/timerd/Makefile.am
View File

@@ -1,6 +1,7 @@
AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
AM_CPPFLAGS += \
@HWLIB_CFLAGS@ \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \

1
src/zapit/lib/Makefile.am
View File

@@ -1,6 +1,7 @@
AM_CPPFLAGS = -fno-rtti -fno-exceptions
AM_CPPFLAGS += \
@HWLIB_CFLAGS@ \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src/zapit/include \