Changeset 30ff455ada25f5c67cf9700404d5f79330ae10d7

Show
Ignore:
Timestamp:
02/19/06 15:54:38 (3 years ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1140360878 +0000
git-parent:

[0f8751b83b164a80914c325185c4dc2f55c5f23d]

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

Attempt to fix linking with "included" gettext

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/Makefile.am

    r238cc87 r30ff455  
    55NULL = 
    66SUBDIRS = 
     7 
     8LIBINTL = @LIBINTL@ 
    79 
    810EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in 
    …… 
    111113    $(TOOLBOX) --update-version 
    112114 
    113 # These dependencies are mandatory 
    114 $(SOURCES_libvlc): $(LIB_intl) 
    115  
    116 ############################################################################### 
    117 # Optional libintl - FIXME, bad dependencies 
    118 ############################################################################### 
    119  
    120 ../intl/libintl.a: FORCE 
    121     cd $(top_builddir)/intl && $(MAKE) $(AM_MAKEFLAGS) 
    122  
    123 if BUILD_INTL 
    124 LIB_intl = ../intl/libintl.a 
    125 endif 
    126  
    127115############################################################################### 
    128116# Building libvlc 
    …… 
    148136libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc` 
    149137libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc` 
     138libvlc_a_LIBADD = $(LIBINTL) 
    150139 
    151140libvlc_pic_a_SOURCES = $(SOURCES_libvlc) 
    …… 
    153142libvlc_pic_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic` 
    154143libvlc_pic_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic` 
     144libvlc_pic_a_LIBADD = $(LIBINTL) 
    155145 
    156146if HAVE_BEOS