* make sure gettext is built before libiconv, since it is needed for its compilation

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index e1ad526c94c2f772029779daacceaf777afc50f4..8b90fb8092762266e4a7ed875c80f6a8667a8b70 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -51,14 +51,14 @@ endif
 # ***************************************************************************
 
 ifeq ($(SYS),DARWIN)
-all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \
+all: .autoconf .libtool .automake .intl .iconv .pkgcfg .freetype .fribidi \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
        .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .openslp \
        .dvdcss .dvdread .dvdnav .dvbpsi .live .goom2k4 .caca .mod \
        .png .gpgerror .gcrypt .gnutls
 endif
 ifeq ($(SYS),BEOS)
-all: .perl .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
+all: .perl .autoconf .libtool .automake .intl .iconv .freetype .fribidi \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
        .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
        .dvdread .dvdnav .dvbpsi
@@ -215,25 +215,6 @@ CLEAN_FILE += .automake
 CLEAN_PKG += automake
 DISTCLEAN_PKG += automake-$(AUTOMAKE_VERSION).tar.gz
 
-# ***************************************************************************
-# libiconv
-# ***************************************************************************
-
-libiconv-$(LIBICONV_VERSION).tar.gz:
-       $(WGET) $(LIBICONV_URL)
-
-libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
-       $(EXTRACT_GZ)
-
-.iconv: libiconv
-       (cd libiconv; ./configure --prefix=$(PREFIX) && make && make install)
-       $(INSTALL_NAME)
-       touch $@
-
-CLEAN_FILE += .iconv
-CLEAN_PKG += libiconv
-DISTCLEAN_PKG += libiconv-$(LIBICONV_VERSION).tar.gz
-
 # ***************************************************************************
 # pkgconfig
 # ***************************************************************************
@@ -251,6 +232,7 @@ pkgconfig: pkgconfig-$(PKGCFG_VERSION).tar.gz
 CLEAN_FILE += .pkgcfg
 CLEAN_PKG += pkgconfig
 DISTCLEAN_PKG += pkgconfig-$(PKGCFG_VERSION).tar.gz
+
 # ***************************************************************************
 # gettext
 # ***************************************************************************
@@ -262,7 +244,7 @@ gettext: gettext-$(GETTEXT_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -p 0 < Patches/gettext.patch
 
-.intl: gettext .iconv
+.intl: gettext
        ( cd $< && ./configure --prefix=$(PREFIX) )
 ifeq ($(SYS),BEOS)
 # The ugliest kludge ever - so libtool correctly links shared libraries
@@ -277,6 +259,25 @@ CLEAN_FILE += .intl
 CLEAN_PKG += gettext
 DISTCLEAN_PKG += gettext-$(GETTEXT_VERSION).tar.gz
 
+# ***************************************************************************
+# libiconv
+# ***************************************************************************
+
+libiconv-$(LIBICONV_VERSION).tar.gz:
+       $(WGET) $(LIBICONV_URL)
+
+libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
+       $(EXTRACT_GZ)
+
+.iconv: libiconv
+       (cd libiconv; ./configure --prefix=$(PREFIX) && make && make install)
+       $(INSTALL_NAME)
+       touch $@
+
+CLEAN_FILE += .iconv
+CLEAN_PKG += libiconv
+DISTCLEAN_PKG += libiconv-$(LIBICONV_VERSION).tar.gz
+
 # ***************************************************************************
 # freetype2
 # ***************************************************************************