From b63d9ddec87b8083b40eed0a214de7a9ec4df268 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 27 Nov 2011 12:04:40 +0200 Subject: [PATCH] Remove Linux distros from old contrib --- extras/contrib/bootstrap | 7 +------ extras/contrib/src/Distributions/debian.mak | 11 ----------- extras/contrib/src/Distributions/fedora.mak | 9 --------- extras/contrib/src/Distributions/ubuntu-medibuntu.mak | 7 ------- 4 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 extras/contrib/src/Distributions/debian.mak delete mode 100644 extras/contrib/src/Distributions/fedora.mak delete mode 100644 extras/contrib/src/Distributions/ubuntu-medibuntu.mak diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap index 71ff339da7..36db6630ce 100755 --- a/extras/contrib/bootstrap +++ b/extras/contrib/bootstrap @@ -296,13 +296,8 @@ if test -z "${DISTRO}" -a "$TARGET" = "$BUILD"; then fi fi # Try to match distribution - if test -f /etc/fedora-release; then - hint_distro fedora - elif test -f /etc/maemo_version; then + if test -f /etc/maemo_version; then hint_distro maemo5 - elif test -f /etc/debian_version; then - # NOTE: check for Debian *after* its derivatives - hint_distro debian fi fi diff --git a/extras/contrib/src/Distributions/debian.mak b/extras/contrib/src/Distributions/debian.mak deleted file mode 100644 index 28a80dcdd2..0000000000 --- a/extras/contrib/src/Distributions/debian.mak +++ /dev/null @@ -1,11 +0,0 @@ -# Debian Linux -all: .iconv .intl .freetype .fribidi .zlib \ - .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \ - .flac .speex .faad .lame .ebml .matroska .ffmpeg .dvdcss \ - .live .goom2k4 .caca .mod .x264 .xml .twolame \ - .png .gpg-error .gcrypt .gnutls .mpcdec \ - .dvdnav .dvbpsi .dirac \ - .dca .raw1394 .dc1394 .lua .zvbi \ - .kate .tiger -# .SDL_image .daap .cddb .cdio .vcdimager - diff --git a/extras/contrib/src/Distributions/fedora.mak b/extras/contrib/src/Distributions/fedora.mak deleted file mode 100644 index e437fc1f46..0000000000 --- a/extras/contrib/src/Distributions/fedora.mak +++ /dev/null @@ -1,9 +0,0 @@ -# Fedora Linux rules -# Most dependencies are available from livna repro. -all: .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \ - .flac .speex .faad .lame .ebml .matroska .ffmpeg \ - .live .goom2k4 .caca .mod .x264 .xml .twolame \ - .mpcdec \ - .dvbpsi .dirac .schroedinger \ - .dca .lua .zvbi .kate .tiger - diff --git a/extras/contrib/src/Distributions/ubuntu-medibuntu.mak b/extras/contrib/src/Distributions/ubuntu-medibuntu.mak deleted file mode 100644 index 55a81f05b4..0000000000 --- a/extras/contrib/src/Distributions/ubuntu-medibuntu.mak +++ /dev/null @@ -1,7 +0,0 @@ -# Automatically generated by bootstrap -# Make changes if you know what you're doing. -# Standard Linux or other UNIX-like systems -DISTRO_PKG= \ - .ffmpeg \ - .live .goom2k4 \ - .libdvbpsi -- 2.39.2