diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.in | 20 | ||||
| -rwxr-xr-x | bootstrap | 4 | ||||
| -rw-r--r-- | configure.in | 24 |
4 files changed, 45 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index a33dc04f1d..d4539591c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1290,3 +1290,5 @@ xbmc/visualizations/EGLHelpers/Makefile /addons/library.xbmc.gui/libXBMC_gui.lib /addons/library.xbmc.pvr/libXBMC_pvr.dll /addons/library.xbmc.pvr/libXBMC_pvr.lib + +/pvr-addons diff --git a/Makefile.in b/Makefile.in index 2395da63b2..d06ff45bee 100644 --- a/Makefile.in +++ b/Makefile.in @@ -388,11 +388,16 @@ endif imagelib: dllloader $(MAKE) -C lib/cximage-6.0 +pvraddons: exports +ifeq (@USE_PVR_ADDONS@,1) + $(MAKE) -C pvr-addons +endif + codecs: papcodecs dvdpcodecs libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH) -externals: codecs libs visualizations screensavers libaddon +externals: codecs libs visualizations screensavers libaddon pvraddons ADDON_BINDINGS = xbmc/interfaces/legacy/legacy.a ADDON_BINDINGS += xbmc/interfaces/python/python_binding.a @@ -495,6 +500,9 @@ endif install-arch: @# Arch dependent files +ifeq (@USE_PVR_ADDONS@,1) + $(MAKE) -C pvr-addons install +endif ifeq ($(findstring freebsd,@ARCH@), freebsd) @find -E system addons -type f -not -iregex ".*svn.*" \ -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs" \ @@ -511,7 +519,7 @@ ifeq ($(findstring Darwin,$(shell uname -s)),Darwin) -exec install "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; \ -exec printf " -- %-75.75s\r" "{}" \; else - @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*" -iregex ".*\.so|.*\.vis|.*\.xbs" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r" + @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*" -iregex ".*\.so|.*\.vis|.*\.xbs|.*\.pvr" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r" endif endif @@ -550,7 +558,7 @@ ifeq ($(findstring Darwin,$(shell uname -s)),Darwin) -exec install -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; \ -exec printf " -- %-75.75s\r" "{}" \; else - @find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r" + @find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pvr" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r" endif endif @# Icons and links @@ -591,11 +599,15 @@ clean-visualisations: for d in $(VIS_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done clean-libaddons: for d in $(LIBADDON_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done +clean-pvraddons: +ifeq (@USE_PVR_ADDONS@,1) + if test -f pvr-addons/Makefile; then $(MAKE) -C pvr-addons clean; fi; +endif clean-codecs: clean-dvdpcodecs clean-papcodecs clean-externals: clean-codecs clean-eventclients clean-xbmctex clean-libs \ - clean-screensavers clean-visualisations clean-libaddons + clean-screensavers clean-visualisations clean-libaddons clean-pvraddons ifeq (1,@GTEST_CONFIGURED@) check: testsuite @@ -15,6 +15,10 @@ autoreconf -vif lib/libdvd/libdvdread autoreconf -vif lib/libdvd/libdvdnav autoreconf -vif lib/gtest +if [ -f pvr-addons/Makefile.am ]; then + autoreconf -vif pvr-addons +fi + # Clean the generated files find . -depth -type d -name "autom4te.cache" -exec rm -rf {} \; diff --git a/configure.in b/configure.in index 38ab0d9dd3..7c32b73a47 100644 --- a/configure.in +++ b/configure.in @@ -2261,6 +2261,16 @@ if test "$host_vendor" = "apple" ; then LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libswscale -lswscale" fi +USE_PVR_ADDONS=0 +DISABLE_PVR_ADDON_CONFIG=1 +if [[ -f "pvr-addons/Makefile.am" ]]; then + final_message="$final_message\n PVR add-ons:\t\tYes" + USE_PVR_ADDONS=1 + DISABLE_PVR_ADDON_CONFIG=0 +else + final_message="$final_message\n PVR add-ons:\t\tNo" +fi + OUTPUT_FILES="Makefile \ Makefile.include \ addons/skin.confluence/media/Makefile \ @@ -2402,7 +2412,7 @@ AC_SUBST(USE_OMXLIB) AC_SUBST(USE_ANDROID) AC_SUBST(GTEST_CONFIGURED) AC_SUBST(USE_DOXYGEN) - +AC_SUBST(USE_PVR_ADDONS) # pushd and popd are not available in other shells besides bash, so implement # our own pushd/popd functions @@ -2731,6 +2741,18 @@ XB_CONFIG_MODULE([lib/gtest], [ --with-pthreads ], [$SKIP_CONFIG_GTEST]) +XB_CONFIG_MODULE([pvr-addons], [ + ./configure \ + --prefix="${prefix}" \ + --host=$host_alias \ + --build=$build_alias \ + --target=$target_alias \ + CC="$CC" \ + CXX="$CXX" \ + CFLAGS="$CFLAGS" \ + CXXFLAGS="$CXXFLAGS" +], [$DISABLE_PVR_ADDON_CONFIG]) + AC_OUTPUT final_message="$final_message\n prefix:\t$prefix\n$dashes" |