diff options
| -rw-r--r-- | Makefile.in | 20 | ||||
| -rw-r--r-- | configure.in | 23 |
2 files changed, 4 insertions, 39 deletions
diff --git a/Makefile.in b/Makefile.in index 7b3fce69a0..0d3ec9b9b3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -448,16 +448,11 @@ endif imagelib: dllloader $(MAKE) -C lib/cximage-6.0 -pvraddons: exports -ifeq (@USE_PVR_ADDONS@,1) - $(MAKE) -C pvr-addons -endif - codecs: papcodecs dvdpcodecs dvdpextcodecs libs: $(LIBSSE4) libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH) -externals: codecs libs visualizations screensavers libaddon pvraddons +externals: codecs libs visualizations screensavers libaddon xcode_depends: \ codecs libs visualizations screensavers eventclients skins libaddon \ @@ -573,9 +568,6 @@ 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 ".*\.git.*" \ -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs" \ @@ -592,7 +584,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 ".*\.git.*" -iregex ".*\.so|.*\.vis|.*\.xbs|.*\.pvr" -exec install -D "{}" $(DESTDIR)$(libdir)/@APP_NAME_LC@/"{}" \; -printf " -- %-75.75f\r" + @find system addons -regextype posix-extended -type f -not -iregex ".*\.git.*" -iregex ".*\.so|.*\.vis|.*\.xbs" -exec install -D "{}" $(DESTDIR)$(libdir)/@APP_NAME_LC@/"{}" \; -printf " -- %-75.75f\r" endif endif @@ -634,7 +626,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|.*\.git.*|.*\.so|.*\.dll|.*\.pvr|$(subst ${space},|,$(INSTALL_FILTER))" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/@APP_NAME_LC@/"{}" \; -printf " -- %-75.75f\r" + @find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*\.git.*|.*\.so|.*\.dll|$(subst ${space},|,$(INSTALL_FILTER))" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/@APP_NAME_LC@/"{}" \; -printf " -- %-75.75f\r" endif endif @# Icons and links @@ -700,15 +692,11 @@ 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-libs \ - clean-screensavers clean-visualisations clean-libaddons clean-pvraddons + clean-screensavers clean-visualisations clean-libaddons ifeq (1,@GTEST_CONFIGURED@) check: testsuite diff --git a/configure.in b/configure.in index 28e7bac9ab..977107230d 100644 --- a/configure.in +++ b/configure.in @@ -2487,16 +2487,6 @@ 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 \ @@ -2681,7 +2671,6 @@ AC_SUBST(USE_OMXLIB) AC_SUBST(USE_ANDROID) AC_SUBST(GTEST_CONFIGURED) AC_SUBST(USE_DOXYGEN) -AC_SUBST(USE_PVR_ADDONS) AC_SUBST(UPNP_DEFINES) AC_SUBST(USE_SSE4) AC_SUBST(USE_MMAL) @@ -2878,18 +2867,6 @@ 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" |