Changeset a525a715b291f0a864fe7c4b5943bca71b280034

Show
Ignore:
Timestamp:
26/11/05 16:36:28 (3 years ago)
Author:
Clément Stenac <zorglub@videolan.org>
git-committer:
Clément Stenac <zorglub@videolan.org> 1133019388 +0000
git-parent:

[747ed7c63fe74800448b8fad5b91e9abd59572a5]

git-author:
Clément Stenac <zorglub@videolan.org> 1133019388 +0000
Message:

* Integrate python bindings in make process
New --enable-python-bindings option
Pic libs will be built if something needing them (shared libvlc, python, mozilla) is built.
* Fix a description in vlcObject

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Makefile.am

    ra697096 ra525a71  
    1010#  - intl should come before modules and . because all the code uses gettext 
    1111#  - modules should come before . because vlc needs the builtins 
    12 #  - . should come before mozilla because the plugin needs libvlc_pic.a 
     12#  - . should come before mozilla/bindings because the plugin needs libvlc_pic.a 
    1313#  - po should come before . because VLC.app needs the pofiles 
    1414#  - loader should come before modules because some plugins need it 
    15 SUBDIRS = intl loader modules po . mozilla activex share m4 doc 
     15SUBDIRS = intl loader modules po . mozilla bindings activex share m4 doc 
    1616DIST_SUBDIRS = $(SUBDIRS) debian ipkg lib 
    1717 
    …… 
    293293lib_LIBRARIES = lib/libvlc.a 
    294294else 
    295 if BUILD_SHARED 
    296 lib_LIBRARIES = lib/libvlc_pic.a 
     295lib_LIBRARIES = lib/libvlc.a 
     296if BUILD_PIC 
     297lib_LIBRARIES += lib/libvlc_pic.a 
    297298else 
    298 lib_LIBRARIES = lib/libvlc.a 
    299 if BUILD_MOZILLA 
    300 lib_LIBRARIES += lib/libvlc_pic.a 
    301 endif 
    302299endif 
    303300endif 

  • bindings/python/vlcglue.c

    r4208865 ra525a71  
    670670      "set(str, value)     Set a variable value" }, 
    671671    { "config_get", vlcObject_config_get, METH_VARARGS, 
    672       "get(str) -> value   Get an option value." }, 
     672      "config_get(str) -> value   Get a configuration option." }, 
    673673    { "config_set", vlcObject_config_set, METH_VARARGS, 
    674       "set(str, value)     Set an option value" }, 
     674      "config_set(str, value)     Set a configuration option" }, 
    675675    { "type", vlcObject_var_type, METH_VARARGS, 
    676676      "type(str) -> str     Get a variable type" }, 

  • configure.ac

    r747ed7c ra525a71  
    13261326[  --enable-release        activate extra optimizations (default disabled)]) 
    13271327test "${enable_release}" != "yes" && enable_release="no" 
     1328 
     1329dnl 
     1330dnl  Is the shared libvlc forced ? 
     1331dnl 
     1332build_pic=no 
     1333AC_ARG_ENABLE(shared-libvlc, 
     1334  [  --enable-shared-libvlc  shared libvlc (default disabled EXPERIMENTAL)], 
     1335  ,[shared_libvlc=no]) 
     1336 
    13281337 
    13291338dnl 
    …… 
    45954604fi 
    45964605 
    4597 dnl  
    4598 dnl  Joystick plugin 
    4599 dnl 
    4600 AC_ARG_ENABLE(joystick, 
    4601   [  --enable-joystick       joystick control (default enabled)]) 
    4602 if test "${enable_joystick}" = "yes"; then 
    4603   AC_CHECK_HEADER(linux/joystick.h, [VLC_ADD_PLUGINS([joystick])]) 
    4604 fi 
    46054606 
    46064607dnl 
    …… 
    48064807]) 
    48074808AM_CONDITIONAL(BUILD_MOZILLA,${mozilla}) 
     4809if test "${mozilla}" != "false" 
     4810then 
     4811  build_pic=yes 
     4812fi 
     4813 
     4814dnl 
     4815dnl  Python bindings 
     4816dnl 
     4817AC_ARG_ENABLE(python-bindings, 
     4818  [  --enable-python-bindings    Enable Python bindings (default disabled)]) 
     4819dnl TODO: look for python dev headers 
     4820AM_CONDITIONAL( BUILD_PYTHON, [test "${enable_python_bindings}" = "yes"] ) 
     4821if test "${enable_python_bindings}" = "yes" 
     4822then 
     4823  build_pic=yes 
     4824fi 
     4825 
    48084826 
    48094827dnl 
    …… 
    49194937AM_CONDITIONAL(HAVE_BUILTINS, ${builtin_support}) 
    49204938 
    4921 AC_ARG_ENABLE(shared-libvlc, 
    4922   [  --enable-shared-libvlc  shared libvlc (default disabled EXPERIMENTAL)], 
    4923   ,[shared_libvlc=no]) 
    4924  
     4939dnl 
     4940dnl Pic and shared libvlc stuff 
     4941dnl 
    49254942AM_CONDITIONAL(BUILD_SHARED, [test "${shared_libvlc}" != "no"]) 
     4943AM_CONDITIONAL(BUILD_PIC, [test "${build_pic}" = "yes" -o "${shared_libvlc}" != "no"] ) 
    49264944AS_IF([test "${shared_libvlc}" != "no"], [ 
    49274945  AC_DEFINE(HAVE_SHARED_LIBVLC, 1, [Define to 1 if libvlc is built as a shared library.]) 
    …… 
    49294947 
    49304948pic=no 
    4931 AS_IF([test "${shared_libvlc}" != "no"], [pic=pic]) 
    4932 AS_IF([${mozilla}], [pic=pic]) 
     4949AS_IF([test "${shared_libvlc}" != "no" -o "${build_pic}" = "yes"], [pic=pic]) 
    49334950AS_IF([test "${SYS}" = "mingw32"], [pic=no]) 
    4934  
    49354951AS_IF([test "${pic}" = "no"], [pic=]) 
    49364952AC_SUBST(pic) 
    …… 
    50175033  activex/Makefile 
    50185034  activex/axvlc.inf 
     5035  bindings/Makefile 
     5036  bindings/python/Makefile 
    50195037  debian/Makefile 
    50205038  doc/Makefile 
    …… 
    51155133rm -f compile 
    51165134echo '#! /bin/sh' >compile 
    5117 echo "PATH=$PATH LANG=C make $* 2>&1| ${srcdir}/extras/make.pl" >>compile 
     5135echo "PATH=$PATH LANG=C make \$\* 2>&1| ${srcdir}/extras/make.pl" >>compile 
    51185136chmod a+x compile 
    51195137