diff --git a/configure.ac b/configure.ac index 243e03534..7249806ec 100644 --- a/configure.ac +++ b/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 diff --git a/lib/Makefile.am b/lib/Makefile.am index 47d51625a..224acc92c 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -15,7 +15,10 @@ SUBDIRS += \ libupnpclient endif +if USE_NEUTRINO_HAL +else if BOXTYPE_TRIPLE SUBDIRS += \ libtriple endif +endif diff --git a/lib/libdvbsub/Makefile.am b/lib/libdvbsub/Makefile.am index b27821edb..a5f0296f8 100644 --- a/lib/libdvbsub/Makefile.am +++ b/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 diff --git a/lib/libtuxtxt/Makefile.am b/lib/libtuxtxt/Makefile.am index c3852770d..f4ef5f23b 100644 --- a/lib/libtuxtxt/Makefile.am +++ b/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 diff --git a/src/Makefile.am b/src/Makefile.am index b2efb30f7..de3ce9573 100644 --- a/src/Makefile.am +++ b/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 diff --git a/src/daemonc/Makefile.am b/src/daemonc/Makefile.am index 4cc65038d..8b9ae1898 100644 --- a/src/daemonc/Makefile.am +++ b/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 diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am index 8f9e42cdf..bda086977 100644 --- a/src/driver/Makefile.am +++ b/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 diff --git a/src/driver/audiodec/Makefile.am b/src/driver/audiodec/Makefile.am index 523b2fabf..786071bf2 100644 --- a/src/driver/audiodec/Makefile.am +++ b/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 diff --git a/src/driver/pictureviewer/Makefile.am b/src/driver/pictureviewer/Makefile.am index 5805e8f37..9ba447e1d 100644 --- a/src/driver/pictureviewer/Makefile.am +++ b/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 diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 4d42ab11b..5607a5eb3 100644 --- a/src/gui/Makefile.am +++ b/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 diff --git a/src/gui/widget/Makefile.am b/src/gui/widget/Makefile.am index 8d92eb76c..ee7cc15d9 100644 --- a/src/gui/widget/Makefile.am +++ b/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 diff --git a/src/nhttpd/tuxboxapi/coolstream/Makefile.am b/src/nhttpd/tuxboxapi/coolstream/Makefile.am index 2d05e02a5..f2ff5bb56 100644 --- a/src/nhttpd/tuxboxapi/coolstream/Makefile.am +++ b/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 diff --git a/src/sectionsd/Makefile.am b/src/sectionsd/Makefile.am index 200019dbe..d22f8b0b5 100644 --- a/src/sectionsd/Makefile.am +++ b/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 diff --git a/src/system/Makefile.am b/src/system/Makefile.am index 1675a6cac..3d0241601 100644 --- a/src/system/Makefile.am +++ b/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 diff --git a/src/zapit/src/Makefile.am b/src/zapit/src/Makefile.am index ff8d16629..0fdc545fa 100644 --- a/src/zapit/src/Makefile.am +++ b/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