Changeset 03dbdfe7b9bc3d749435c27cc01d0606f411a4e1

Show
Ignore:
Timestamp:
03/18/08 09:27:19 (6 months ago)
Author:
Rafaël Carré <funman@videolan.org>
git-committer:
Rafaël Carré <funman@videolan.org> 1205828839 +0100
git-parent:

[97a9d4e927bdbac13eba6c65d204b07b5d7b3376]

git-author:
Rafaël Carré <funman@videolan.org> 1205828787 +0100
Message:

Fix out of tree building of the python bindings

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • bindings/python/Makefile.am

    rf1fac53 r03dbdfe  
    1616    COMPILERARG= 
    1717endif 
    18     srcdir="$(srcdir)" top_builddir="$(top_builddir)" python "$(srcdir)/setup.py" build $(COMPILERARG) "--build-base=$(top_builddir)/bindings/python" "--build-temp=$(top_builddir)/bindings/python" 
     18    srcdir="`cd $(srcdir);pwd`" top_builddir="$(abs_top_builddir)" python "$(srcdir)/setup.py" build $(COMPILERARG) 
    1919 
    20 # FIXME: python setup.py install does not have any option to install from a different build directory 
    21 # so this will not work in a separate builddir 
    2220install: 
    23     python $(srcdir)/setup.py install 
     21    top_builddir="$(abs_top_builddir)" srcdir="`cd $(srcdir);pwd`" python $(srcdir)/setup.py install 
    2422 
    2523clean: 

  • bindings/python/setup.py

    r93b4565 r03dbdfe  
    9393# To compile in a local vlc tree 
    9494vlclocal = Extension('vlc', 
    95                      sources = [ os.path.join( srcdir, f ) for f in source_files ], 
    96                      include_dirs = [ top_builddir, 
    97                                       os.path.join( srcdir, '..', '..', 'include' ), 
    98                                       srcdir, 
    99                                       '/usr/win32/include' ], 
    100                 extra_objects = [ ], 
     95       sources = [ os.path.join( srcdir, f ) for f in source_files ], 
     96       include_dirs = [ top_builddir, 
     97                 os.path.join( srcdir, '..', '..', 'include' ), 
     98                 srcdir, 
     99                 '/usr/win32/include' ], 
     100       extra_objects = [ ], 
    101101                extra_compile_args = get_cflags(), 
    102102        extra_link_args = linkargs + get_ldflags(),