Changeset 56e9569c94674100e92c395deac7ca3b9baaf9ea

Show
Ignore:
Timestamp:
03/11/07 12:04:38 (1 year ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1173611078 +0000
git-parent:

[7761fafedec714e50b0b8c4717509c04d820d2a7]

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

- Improve DIST_SUBDIR
- Require automake 1.9 to fix some libtool plugin build problems
- Remove useless libs/Makefile

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Makefile.am

    r066e58d r56e9569  
    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 libs src modules po . mozilla bindings activex share m4 doc 
    16 DIST_SUBDIRS = $(SUBDIRS)  ipkg 
     15SUBDIRS = intl po libs/loader libs/srtp src modules . \ 
     16        mozilla bindings activex share doc 
     17DIST_SUBDIRS = $(SUBDIRS) m4 ipkg 
    1718 
    1819EXTRA_DIST = \ 

  • bootstrap

    r6871383 r56e9569  
    6565# Check for automake 
    6666amvers="no" 
    67 for v in "-1.10" "110" "-1.9" "19" "-1.8" "18" "-1.7" "17"; do 
     67for v in "-1.10" "110" "-1.9" "19"; do 
    6868  if automake${v} --version >/dev/null 2>&1; then 
    6969    amsuff="${v}" 
    …… 
    7979 
    8080case "${amvers}" in 
    81   no|1.[0123456]|1.[0123456].*|1[0123456]|1.[0123456]-*) 
     81  no|1.[012345678]|1.[0123456].*|1[0123456]|1.[0123456]-*) 
    8282    set +x 
    83     echo "$0: you need automake version 1.7 or later" 
     83    echo "$0: you need automake version 1.9 or later" 
    8484    exit 1 
    8585    ;; 

  • configure.ac

    r10ee356 r56e9569  
    1010CODENAME="Grishenko" 
    1111 
    12 AC_PREREQ(2.59) 
     12AC_PREREQ(2.59) dnl this really should be 2.59c 
    1313AC_CONFIG_SRCDIR(src/libvlc.c) 
    1414AC_CONFIG_AUX_DIR(autotools) 
    …… 
    1616AC_CANONICAL_HOST 
    1717 
    18 AM_INIT_AUTOMAKE([1.7 check-news dist-bzip2]) 
     18AM_INIT_AUTOMAKE([1.9 check-news dist-bzip2 no-dist-gzip -Wall]) 
    1919AM_CONFIG_HEADER(config.h) 
    2020 
    …… 
    2727AS_IF([test "x${enable_maintainer_mode}" != "xno"], 
    2828    [enable_maintainer_mode="yes"]) 
    29  
    30 dnl HA! HA! 
    3129AM_MAINTAINER_MODE 
    3230 
    …… 
    57755773  intl/Makefile 
    57765774  ipkg/Makefile 
    5777   libs/Makefile 
    57785775  libs/loader/Makefile 
    57795776  libs/srtp/Makefile