Changeset 80def97f15e46bcf4aab4a246e7b5f0acdbb77c4

Show
Ignore:
Timestamp:
08/15/07 19:37:20 (1 year ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1187199440 +0000
git-parent:

[7ca5e9c1aadc09bfd8cf5569e47396651b4591b7]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1187199440 +0000
Message:

Continue fixing static builds

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Makefile.am

    r343ef81 r80def97  
    279279      c|*) cmd="$(LINK)" ;; \ 
    280280    esac ; \ 
    281     cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDFLAGS) $(vlc_LDADD)" ; \ 
     281    cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \ 
    282282    echo $$cmd ; \ 
    283283    eval $$cmd 

  • bootstrap

    rc44c43b r80def97  
    222222include Modules.am 
    223223 
     224if HAVE_PLUGINS 
    224225LTLIBVLC = -L\$(top_builddir)/src -lvlc 
    225226 
    …… 
    232233endif 
    233234AM_LIBADD = \$(LTLIBVLC) 
     235endif 
    234236 
    235237all: all-modules 

  • include/vlc_modules_macros.h

    r4832f08 r80def97  
    4242 * #define MODULE_STRING "foo" 
    4343 * 
    44  * and, if __BUILTIN__ is set, we will also need: 
     44 * and, if HAVE_DYNAMIC_PLUGINS is NOT set, we will also need: 
    4545 * #define MODULE_FUNC( zog ) module_foo_zog 
    4646 * 
    …… 
    5757/* If the module is built-in, then we need to define foo_InitModule instead 
    5858 * of InitModule. Same for Activate- and DeactivateModule. */ 
    59 #if defined( __BUILTIN__ ) 
     59#if defined (HAVE_DYNAMIC_PLUGINS) 
     60#   define E_( function )          CONCATENATE( function, MODULE_SYMBOL ) 
     61#   define __VLC_SYMBOL( symbol  ) CONCATENATE( symbol, MODULE_SYMBOL ) 
     62#else 
    6063#   define E_( function )          CONCATENATE( function, MODULE_NAME ) 
    6164#   define __VLC_SYMBOL( symbol )  CONCATENATE( symbol, MODULE_NAME ) 
    62 #elif defined( __PLUGIN__ ) 
    63 #   define E_( function )          CONCATENATE( function, MODULE_SYMBOL ) 
    64 #   define __VLC_SYMBOL( symbol  ) CONCATENATE( symbol, MODULE_SYMBOL ) 
    6565#endif 
    6666