diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 5efe6cbed7..21d2288705 100644 --- a/Makefile.in +++ b/Makefile.in @@ -120,11 +120,14 @@ LIB_DIRS=\ lib/libhdhomerun \ lib/libid3tag \ lib/libapetag \ - xbmc/interfaces/python/linux \ lib/cpluff \ lib/xbmc-dll-symbols \ lib/jsoncpp/src/lib_json +ifneq (@USE_EXTERNAL_PYTHON@,1) +LIB_DIRS+=xbmc/interfaces/python/linux +endif + SS_DIRS=\ xbmc/screensavers/rsxs-0.9/xbmc @@ -168,6 +171,12 @@ DISTCLEAN_FILES=config.h config.log config.status tools/Linux/xbmc.sh \ lib/python/libpython2.4.so.1.0 \ system/libcpluff-@ARCH@.so +ifneq (@USE_EXTERNAL_PYTHON@,1) + PYTHON_TARGET=python +else + PYTHON_TARGET= +endif + all : Makefile externals xbmc.bin xbmc-xrandr skins include Makefile.include @@ -407,8 +416,10 @@ endif libpython: dllloader $(MAKE) -C xbmc/interfaces/python $(MAKE) -C xbmc/interfaces/python/xbmcmodule +ifneq (@USE_EXTERNAL_PYTHON@,1) python: dllloader $(MAKE) -C xbmc/interfaces/python/linux +endif dvdpcodecs: dllloader $(MAKE) -C lib $(MAKE) -C lib/libdvd @@ -453,6 +464,12 @@ codecs: papcodecs dvdpcodecs libs: cmyth libhdhomerun libid3tag imagelib libexif python system/libcpluff-@ARCH@.so externals: codecs libs python visualizations screensavers +ifeq ($(findstring osx,@ARCH@), osx) +libs: libhdhomerun libid3tag imagelib libexif $(PYTHON_TARGET) system/libcpluff-@ARCH@.so system/players/paplayer/libmodplug-@ARCH@.so +else +libs: libhdhomerun libid3tag imagelib libexif $(PYTHON_TARGET) system/libcpluff-@ARCH@.so +endif + xcode_depends: \ codecs libs python visualizations screensavers eventclients skins \ lib/libsquish/libsquish.a \ @@ -579,6 +596,10 @@ ifeq ($(findstring arm,@ARCH@), arm) LIBS +=-lpython2.6 endif +ifeq (@USE_EXTERNAL_PYTHON@,1) +LIBS += @PYTHON_LDFLAGS@ +endif + xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC) ifeq ($(findstring osx,@ARCH@), osx) $(CXX) $(LDFLAGS) -o xbmc.bin -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic |