mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/nhttpd/Makefile.am


Origin commit data
------------------
Commit: 2eafc848f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)
This commit is contained in:
vanhofen
2016-11-16 23:43:57 +01:00
parent 0b775a0c4f e912e06163
commit 2a64edef4f
15 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -220,7 +220,7 @@ 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' HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream -I$(top_srcdir)/src/zapit/include/private'
if test "$BOXMODEL" = "apollo"; then if test "$BOXMODEL" = "apollo"; then
if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then
@@ -229,7 +229,7 @@ fi
if test -e ${srcdir}/lib/libcoolstream2/cs_frontpanel.h; then 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 <cs_frontpanel.h> header file.]) AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H,1,[Define to 1 if you have the <cs_frontpanel.h> header file.])
fi fi
HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2' HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2 -I$(top_srcdir)/src/zapit/include/private'
fi fi
fi fi

1
lib/sectionsdclient/Makefile.am
View File

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

1
lib/timerdclient/Makefile.am
View File

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

1
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 = -fno-rtti -fno-exceptions -D_FILE_OFFSET_BITS=64
AM_CPPFLAGS += \ AM_CPPFLAGS += \
@HWLIB_CFLAGS@ \
-I$(srcdir) \ -I$(srcdir) \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(top_srcdir) \ -I$(top_srcdir) \

1
src/nhttpd/yhttpd_mods/Makefile.am
View File

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

1
src/timerd/Makefile.am
View File

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

0
src/zapit/include/linux/dvb/audio.h → src/zapit/include/private/linux/dvb/audio.h
View File

0
src/zapit/include/linux/dvb/ca.h → src/zapit/include/private/linux/dvb/ca.h
View File

0
src/zapit/include/linux/dvb/dmx.h → src/zapit/include/private/linux/dvb/dmx.h
View File

0
src/zapit/include/linux/dvb/frontend.h → src/zapit/include/private/linux/dvb/frontend.h
View File

0
src/zapit/include/linux/dvb/net.h → src/zapit/include/private/linux/dvb/net.h
View File

0
src/zapit/include/linux/dvb/osd.h → src/zapit/include/private/linux/dvb/osd.h
View File

0
src/zapit/include/linux/dvb/version.h → src/zapit/include/private/linux/dvb/version.h
View File

0
src/zapit/include/linux/dvb/video.h → src/zapit/include/private/linux/dvb/video.h
View File

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

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