enable usage of a separately built replacement of libtriple

In order to improve portability, libtriple will be split off and
built separately as "libneutrino-hal" (for hardware abstraction layer)
Enable the makefiles to deal with that.

configure.ac

@@ -114,6 +114,16 @@ if test "$enable_upnp" = "yes"; then
 	AC_DEFINE(ENABLE_UPNP,1,[include UPNP support - currently broken])
 fi
 
+AC_ARG_WITH(neutrino-hal-includes,
+	[  --with-neutrinohal-includes=PATH  path for libneutrino-hal includes [[NONE]]],
+	[NEUTRINO_HAL_INC="$withval"],[NEUTRINO_HAL_INC=""])
+AC_ARG_WITH(neutrino-hal-build,
+	[  --with-neutrinohal-build=PATH   path where libneutrino-hal is built [[NONE]]],
+	[NEUTRINO_HAL_LIB="$withval"],[NEUTRINO_HAL_LIB=""])
+
+AM_CONDITIONAL(USE_NEUTRINO_HAL, test "$NEUTRINO_HAL_INC")
+
+
 AC_CHECK_HEADERS(coolstream/nevis_ir.h)
 
 #
@@ -137,6 +147,8 @@ AC_SUBST(FREETYPE_CFLAGS)
 AC_SUBST(FREETYPE_LIBS)
 AC_SUBST(VORBISIDEC_CFLAGS)
 AC_SUBST(VORBISIDEC_LIBS)
+AC_SUBST(NEUTRINO_HAL_INC)
+AC_SUBST(NEUTRINO_HAL_LIB)
 
 AC_OUTPUT([
 Makefile

lib/Makefile.am

@@ -15,7 +15,10 @@ SUBDIRS += \
 	libupnpclient
 endif
 
+if USE_NEUTRINO_HAL
+else
 if BOXTYPE_TRIPLE
 SUBDIRS += \
 	libtriple
 endif
+endif

lib/libdvbsub/Makefile.am

@@ -5,9 +5,13 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+if USE_NEUTRINO_HAL
+INCLUDES += -I$(NEUTRINO_HAL_INC)
+else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
+endif
 
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 

lib/libtuxtxt/Makefile.am

@@ -6,9 +6,13 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+if USE_NEUTRINO_HAL
+INCLUDES += -I$(NEUTRINO_HAL_INC)
+else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
+endif
 
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 

src/Makefile.am

@@ -19,9 +19,15 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+if USE_NEUTRINO_HAL
+INCLUDES += -I$(NEUTRINO_HAL_INC)
+else
+if BOXTYPE_TRIPLE
+INCLUDES += -I$(top_srcdir)/lib/libtriple
+endif
+endif
 if BOXTYPE_TRIPLE
 SUBDIRS += lcddisplay
-INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
 
 if USE_TREMOR
@@ -106,9 +112,17 @@ bin_PROGRAMS += drivertool
 
 drivertool_SOURCES = drivertool.c
 endif
+if USE_NEUTRINO_HAL
+neutrino_LDADD += \
+	$(NEUTRINO_HAL_LIB)/libneutrino-hal.a
+else
+if BOXTYPE_TRIPLE
+neutrino_LDADD += \
+	$(top_builddir)/lib/libtriple/libtriple.a
+endif
+endif
 if BOXTYPE_TRIPLE
 neutrino_LDADD += \
-	$(top_builddir)/lib/libtriple/libtriple.a \
 	@DIRECTFB_LIBS@ \
 	$(top_builddir)/src/lcddisplay/liblcddisplay.a
 endif

src/daemonc/Makefile.am

@@ -14,9 +14,13 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+if USE_NEUTRINO_HAL
+INCLUDES += -I$(NEUTRINO_HAL_INC)
+else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
+endif
 
 noinst_LIBRARIES = libneutrino_daemonc.a
 

src/driver/Makefile.am

@@ -47,11 +47,19 @@ if BOXTYPE_TRIPLE
 libneutrino_driver_a_SOURCES += \
 	newclock.cpp \
 	lcdd.cpp
+endif
 
+if USE_NEUTRINO_HAL
+INCLUDES += \
+	-I$(NEUTRINO_HAL_INC) \
+	@DIRECTFB_CFLAGS@
+else
+if BOXTYPE_TRIPLE
 INCLUDES += \
 	-I$(top_srcdir)/lib/libtriple \
 	@DIRECTFB_CFLAGS@
 endif
+endif
 
 libneutrino_driver_netfile_a_SOURCES = netfile.cpp
 

src/driver/audiodec/Makefile.am

@@ -11,9 +11,13 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+if USE_NEUTRINO_HAL
+INCLUDES += -I$(NEUTRINO_HAL_INC)
+else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
+endif
 
 noinst_LIBRARIES = libneutrino_driver_audiodec.a
 

src/driver/pictureviewer/Makefile.am

@@ -10,9 +10,13 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+if USE_NEUTRINO_HAL
+INCLUDES += -I$(NEUTRINO_HAL_INC)
+else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
+endif
 
 noinst_LIBRARIES = libneutrino_pictureviewer.a
 

src/gui/Makefile.am

@@ -30,9 +30,14 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+
+if USE_NEUTRINO_HAL
+INCLUDES += -I$(NEUTRINO_HAL_INC)
+else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
+endif
 
 noinst_LIBRARIES = libtimerlist.a libneutrino_gui.a libneutrino_gui2.a
 

src/gui/widget/Makefile.am

@@ -11,9 +11,13 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+if USE_NEUTRINO_HAL
+INCLUDES += -I$(NEUTRINO_HAL_INC)
+else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
+endif
 
 noinst_LIBRARIES = libneutrino_gui_widget.a libneutrino_gui_widget2.a 
 

src/nhttpd/tuxboxapi/coolstream/Makefile.am

@@ -16,9 +16,13 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+if USE_NEUTRINO_HAL
+INCLUDES += -I$(NEUTRINO_HAL_INC)
+else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
+endif
 
 noinst_LIBRARIES = libnhttpd_tuxboxapi.a
 

src/sectionsd/Makefile.am

@@ -10,9 +10,13 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+if USE_NEUTRINO_HAL
+INCLUDES += -I$(NEUTRINO_HAL_INC)
+else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
+endif
 
 AM_CPPFLAGS = -D DO_NOT_INCLUDE_STUFF_NOT_NEEDED_FOR_SECTIONSD
 

src/system/Makefile.am

@@ -15,9 +15,13 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+if USE_NEUTRINO_HAL
+INCLUDES += -I$(NEUTRINO_HAL_INC)
+else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
+endif
 
 noinst_LIBRARIES = libneutrino_system.a
 

src/zapit/src/Makefile.am

@@ -12,9 +12,14 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
+
+if USE_NEUTRINO_HAL
+INCLUDES += -I$(NEUTRINO_HAL_INC)
+else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
 endif
+endif
 
 noinst_LIBRARIES = libzapit.a