diff options
| author | Jim Carroll <thecarrolls@jiminger.com> | 2011-04-06 15:10:39 -0400 |
|---|---|---|
| committer | Jim Carroll <thecarrolls@jiminger.com> | 2011-04-06 15:10:39 -0400 |
| commit | a2887c00928b5818e71baaab6821657887aae452 (patch) | |
| tree | 470f858c88e138d2a847f686e18ac8d718bc730e /Makefile.in | |
| parent | d645bde8a5fbe1c2ca437ad42be10237fa75bdda (diff) | |
| parent | bd3d7329aea96ded66611d1a9d379b16fd7803f4 (diff) | |
Merge remote branch 'mine/ext-python'
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 478a9e1a1b..cf0f9e5d88 100644 --- a/Makefile.in +++ b/Makefile.in @@ -119,11 +119,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 @@ -167,6 +170,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 @@ -404,8 +413,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 @@ -447,11 +458,11 @@ imagelib: dllloader $(MAKE) -C lib/cximage-6.0 codecs: papcodecs dvdpcodecs -libs: cmyth libhdhomerun libid3tag imagelib libexif python system/libcpluff-@ARCH@.so -externals: codecs libs python visualizations screensavers +libs: cmyth libhdhomerun libid3tag imagelib libexif $(PYTHON_TARGET) system/libcpluff-@ARCH@.so +externals: codecs libs $(PYTHON_TARGET) visualizations screensavers xcode_depends: \ - codecs libs python visualizations screensavers eventclients skins \ + codecs libs $(PYTHON_TARGET) visualizations screensavers eventclients skins \ lib/libsquish/libsquish.a \ lib/libapetag/.libs/libapetag.a \ lib/libRTV/librtv.a \ @@ -574,6 +585,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 |