Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

changed: Makefile.in cleanup after removing internal python on linux …

…+ updated READMEs
  • Loading branch information...
commit ef0ee8326a6f7b8f232c500ca6501623b738c8bc 1 parent 209441a
vdrfan authored
Showing with 8 additions and 17 deletions.
  1. +5 −10 Makefile.in
  2. +2 −6 README.linux
  3. +1 −1  README.ubuntu
View
15 Makefile.in
@@ -161,9 +161,6 @@ CLEAN_FILES=xbmc.bin xbmc-xrandr
DISTCLEAN_FILES=config.h config.log config.status tools/Linux/xbmc.sh \
tools/Linux/xbmc-standalone.sh autom4te.cache config.h.in~ \
- lib/python/Include/pyconfig.h \
- lib/python/configure.lineno \
- lib/python/libpython2.4.so.1.0 \
system/libcpluff-@ARCH@.so
all : Makefile externals xbmc.bin xbmc-xrandr skins
@@ -621,17 +618,15 @@ endif
install-arch:
@# Arch dependent files
ifeq ($(findstring freebsd,@ARCH@), freebsd)
- @find -E system addons -type f -not -iregex ".*svn.*|.*script\.module\..*" \
- -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*python.*\.zip" \
+ @find -E system addons -type f -not -iregex ".*svn.*" \
+ -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs" \
-exec sh -c "install -d \"$(DESTDIR)$(libdir)/xbmc/\`dirname '{}'\`\"" \; \
-and \
-exec install "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; \
-exec printf " -- %-75.75s\r" "{}" \;
else
- @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.*" -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
endif
- @cp -r addons/script.module.pil $(DESTDIR)$(libdir)/xbmc/addons/
- @cp -r addons/script.module.pysqlite $(DESTDIR)$(libdir)/xbmc/addons/
install-scripts:
@install -d $(DESTDIR)$(bindir)
@@ -653,13 +648,13 @@ install-datas: install-scripts
@# Arch independent files
ifeq ($(findstring bsd,@ARCH@), bsd)
@find -E addons language media sounds userdata system -type f \
- -not -iregex ".*script\.module\..*|.*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python.*\.zip" \
+ -not -iregex ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll" \
-exec sh -c "install -d \"$(DESTDIR)$(datarootdir)/xbmc/\`dirname '{}'\`\"" \; \
-and \
-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 ".*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 ".*@ARCH@.*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
endif
@# Icons and links
@install -d $(DESTDIR)$(datarootdir)/applications
View
8 README.linux
@@ -53,7 +53,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
libwavpack-dev, python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev,
libbluetooth-dev, zlib1g-dev, libsmbclient-dev,
libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev,
- libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl
+ libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl, python-dev
*** For developers and anyone else who compiles frequently it is recommended to
use ccache
@@ -94,11 +94,7 @@ Tip: by adding -j<number> to the make command, you describe how many
$ make -j2
-.3 $ make -C lib/addons/script.module.pil
-
-.4 $ make -C lib/addons/script.module.pysqlite
-
-.5 $ make install
+.3 $ make install
This will install XBMC in the prefix provided in 4.1 as well as a launcher script.
View
2  README.ubuntu
@@ -44,7 +44,7 @@ Two methods exist to install the required Ubuntu packages:
For Ubuntu (all versions >= 7.04):
- # sudo apt-get install subversion make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs
+ # sudo apt-get install subversion make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev
For Ubuntu Maverick (10.10):
# sudo apt-get install autopoint
Please sign in to comment.
Something went wrong with that request. Please try again.