Changeset f8ba1a1175ce01b5510d6fea1e23218025a118e6

Show
Ignore:
Timestamp:
09/25/06 14:31:41 (2 years ago)
Author:
Olivier Aubert <olivier.aubert@liris.cnrs.fr>
git-committer:
Olivier Aubert <olivier.aubert@liris.cnrs.fr> 1159187501 +0000
git-parent:

[4c5ad8e3f364ff605509a95f26d4653a7bf96b00]

git-author:
Olivier Aubert <olivier.aubert@liris.cnrs.fr> 1159187501 +0000
Message:

mediacontrol-python: try to fix r16794

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • bindings/mediacontrol-python/Makefile.am

    rd7d799b rf8ba1a1  
    1717 
    1818all: 
    19     top_srcdir="$(top_srcdir)" top_builddir="$(top_builddir)" python "$(srcdir)/setup.py" build $(COMPILERARG) "--build-base=$(top_builddir)/bindings/mediacontrol-python" "--build-temp=$(top_builddir)/bindings/mediacontrol-python" 
     19    srcdir="$(srcdir)" top_builddir="$(top_builddir)" python "$(srcdir)/setup.py" build $(COMPILERARG) "--build-base=$(top_builddir)/bindings/mediacontrol-python" "--build-temp=$(top_builddir)/bindings/mediacontrol-python" 
    2020 
    2121# FIXME: python setup.py install does not have any option to install from a different build directory 

  • bindings/mediacontrol-python/setup.py

    rd7d799b rf8ba1a1  
    1515 
    1616try: 
    17     top_srcdir=os.environ['top_srcdir'] 
     17    srcdir=os.environ['srcdir'] 
    1818except KeyError: 
    1919    # Note: same as above 
    2020    srcdir=None 
    21 if not top_srcdir: 
    22     top_srcdir = os.path.join( '..', '..' ) 
    23     os.environ['top_srcdir'] = top_srcdir 
     21if not srcdir: 
     22    srcdir = '.' 
    2423 
    25 vlclib= "-L"  + os.path.join( top_builddir, 'src') + " -lvlc" 
     24vlclib="-lvlc" 
    2625picflag='' 
    27 srcdir=os.path.join( top_srcdir, 'bindings', 'mediacontrol-python' ) 
    2826 
    2927def get_vlcconfig(): 
    …… 
    8078                     sources = [ os.path.join( srcdir, f ) for f in source_files ], 
    8179                     include_dirs = [ top_builddir, 
    82                                       os.path.join( top_srcdir, 'include' ), 
     80                                      os.path.join( srcdir, '..', '..', 'include' ), 
    8381                                      srcdir, 
    8482                                      '/usr/win32/include' ], 
    8583                extra_objects = [ vlclib ], 
    8684                extra_compile_args = get_cflags(), 
    87         extra_link_args = [ '-L' + top_builddir ]  + get_ldflags(), 
     85        extra_link_args = [ '-L' + os.path.join(top_builddir, 'src') ]  + get_ldflags(), 
    8886                ) 
    8987