Permalink
Browse files

merge pvr-testing2 svn rev 32591 into trunk

  • Loading branch information...
1 parent 07db21c commit 2c81a1063d956cbe49b3460076b1ce3ef6505518 @opdenkamp opdenkamp committed Oct 16, 2010
Showing 466 changed files with 126,638 additions and 253 deletions.
View
@@ -28,6 +28,7 @@ BIN_DIRS= \
xbmc/FileSystem/MusicDatabaseDirectory \
xbmc/FileSystem/VideoDatabaseDirectory \
xbmc/karaoke \
+ xbmc/addons \
xbmc/lib/cmyth/libcmyth \
xbmc/lib/cmyth/librefmem \
xbmc/lib/libhts \
@@ -45,6 +46,7 @@ BIN_DIRS= \
xbmc/lib/libsquish \
xbmc/visualizations \
xbmc/screensavers \
+ xbmc/pvrclients \
xbmc/utils \
xbmc/settings \
xbmc/linux \
@@ -118,6 +120,18 @@ ifneq (@BUILD_GOOM@,1)
VIS_DIRS+=xbmc/visualizations/Goom
endif
+PVR_DIRS=\
+ xbmc/pvrclients/MediaPortal \
+ xbmc/pvrclients/mythtv \
+ xbmc/pvrclients/vdr-streamdev \
+ xbmc/pvrclients/vdr-vnsi \
+ xbmc/pvrclients/tvheadend
+
+LIBADDON_DIRS=\
+ lib/addons/library.xbmc.addon \
+ lib/addons/library.xbmc.pvr \
+ lib/addons/library.xbmc.gui \
+
CONFLUENCE_MEDIA=addons/skin.confluence/media
SKIN_DIRS=\
@@ -127,7 +141,8 @@ LIVE_DIRS=\
tools/XBMCLive
DIRS= $(BIN_DIRS) $(EC_DIRS) $(XBMCTEX_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS) \
- $(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(SKIN_DIRS) $(LIVE_DIRS)
+ $(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(PVR_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS) \
+ $(LIVE_DIRS)
LIBS=@LIBS@
CFLAGS=@CFLAGS@
@@ -148,8 +163,8 @@ all : Makefile externals xbmc.bin xbmc-xrandr skins
include Makefile.include
-.PHONY : dllloader exports visualizations screensavers eventclients papcodecs \
- dvdpcodecs imagelib codecs externals force skins
+.PHONY : dllloader exports pvrclients visualizations screensavers eventclients \
+ papcodecs dvdpcodecs imagelib codecs externals force libaddon skins
# hack targets to keep build system up to date
Makefile : config.status $(addsuffix .in, $(AUTOGENERATED_MAKEFILES))
@@ -268,6 +283,8 @@ xbmc/settings/settings.a: force
$(MAKE) -C xbmc/settings
xbmc/utils/utils.a: force
$(MAKE) -C xbmc/utils
+xbmc/pvrclients/pvrclient.a: force
+ $(MAKE) -C xbmc/pvrclients
xbmc/osx/osx.a: force
$(MAKE) -C xbmc/osx
xbmc/lib/libapetag/.libs/libapetag.a: force
@@ -317,10 +334,20 @@ ifeq ($(or $(findstring powerpc-linux,$(ARCH)),$(findstring powerpc64-linux,$(AR
endif
endif
endif
+pvrclients: exports
+ $(MAKE) -C xbmc/pvrclients/MediaPortal
+ $(MAKE) -C xbmc/pvrclients/mythtv
+ $(MAKE) -C xbmc/pvrclients/vdr-streamdev
+ $(MAKE) -C xbmc/pvrclients/vdr-vnsi
+ $(MAKE) -C xbmc/pvrclients/tvheadend
screensavers: exports
ifneq (arm, $(ARCH))
$(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc
endif
+libaddon: exports
+ $(MAKE) -C lib/addons/library.xbmc.addon
+ $(MAKE) -C lib/addons/library.xbmc.gui
+ $(MAKE) -C lib/addons/library.xbmc.pvr
libpython: dllloader
$(MAKE) -C xbmc/lib/libPython
$(MAKE) -C xbmc/lib/libPython/xbmcmodule
@@ -374,10 +401,10 @@ libs: libhdhomerun libid3tag imagelib libexif python system/libcpluff-$(ARCH).so
else
libs: libhdhomerun libid3tag imagelib libexif python system/libcpluff-$(ARCH).so
endif
-externals: codecs libs python visualizations screensavers
+externals: libaddon codecs libs python pvrclients visualizations screensavers
xcode_depends: \
- codecs libs python visualizations screensavers eventclients skins \
+ codecs libs python pvrclients visualizations screensavers eventclients skins \
xbmc/lib/libsquish/libsquish-@ARCH@.a \
xbmc/lib/libapetag/.libs/libapetag.a \
xbmc/lib/cmyth/libcmyth/libcmyth.a \
@@ -517,7 +544,7 @@ endif
install-arch:
@# Arch dependent files
- @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*|.*script\.module\..*" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs|.*python.*\.zip" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*|.*script\.module\..*" -iregex ".*$(ARCH).*|.*\.pvr|.*\.vis|.*\.xbs|.*\.so|.*python.*\.zip" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
@cp -r addons/script.module.pil $(DESTDIR)$(libdir)/xbmc/addons/
@cp -r addons/script.module.pysqlite $(DESTDIR)$(libdir)/xbmc/addons/
@@ -534,7 +561,7 @@ install-datas: install-scripts
@echo "Done!"
@echo "Copying system files to $(DESTDIR)$(datarootdir)/xbmc"
@# Arch independent files
- @find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*script\.module\..*|.*$(ARCH).*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python.*\.zip" -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 ".*script\.module\..*|.*$(ARCH).*|.*\.pvr|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python.*\.zip" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
@# Icons and links
@mkdir -p $(DESTDIR)$(datarootdir)/applications
@cp -a tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/
@@ -556,6 +583,8 @@ uninstall:
@rm -rf $(DESTDIR)$(datarootdir)/xbmc $(DESTDIR)$(bindir)/xbmc
@rm -rf $(DESTDIR)$(bindir)/xbmc-standalone
@rm -rf $(DESTDIR)$(datarootdir)/xsessions/XBMC.desktop
+ @rm -rf $(libdir)/libXBMC_*
+ @rm -rf $(prefix)/include/xbmc
@echo "Done!"
reallyclean:
@@ -602,10 +631,12 @@ clean-screensavers:
for d in $(SS_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
clean-visualisations:
for d in $(VIS_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
+clean-pvrclients:
+ for d in $(PVR_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-codecs: clean-dvdpcodecs clean-papcodecs
clean-externals: clean-codecs clean-eventclients clean-xbmctex clean-libs \
- clean-screensavers clean-visualisations
-
-
+ clean-pvrclients clean-screensavers clean-visualisations clean-libaddons
Oops, something went wrong.

0 comments on commit 2c81a10

Please sign in to comment.