contrib/src/Makefile: Checkout CMake project into 'cmake' subdirectory, set up code...

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 0eb739b77057dc35350ee17dac95e963d3312369..6c1776b477726ec85802a509e91c23488106c1ee 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -260,12 +260,14 @@ DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.bz2
 # ***************************************************************************
 # CMake
 # ***************************************************************************
-
-cmake-$(CMAKE_VERSION).tar.gz:
-       $(WGET) $(CMAKE_URL)
-
-cmake: cmake-$(CMAKE_VERSION).tar.gz
-       $(EXTRACT_GZ)
+# cmake-$(CMAKE_VERSION).tar.gz:
+#      $(WGET) $(CMAKE_URL)
+#      
+# cmake: cmake-$(CMAKE_VERSION).tar.gz
+#      $(EXTRACT_GZ)
+       
+cmake: 
+       cvs -d :pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake co -d cmake CMake
 
 .cmake: cmake
        (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
@@ -273,7 +275,6 @@ cmake: cmake-$(CMAKE_VERSION).tar.gz
 
 CLEAN_FILE += .cmake
 CLEAN_PKG += cmake
-DISTCLEAN_PKG += cmake-$(CMAKE_VERSION).tar.gz
 
 # ***************************************************************************
 # libtool
@@ -1198,6 +1199,14 @@ else
 endif
 endif
 endif
+       cp $</groupsock/libgroupsock.a $(PREFIX)/lib
+       cp $</liveMedia/libliveMedia.a $(PREFIX)/lib
+       cp $</UsageEnvironment/libUsageEnvironment.a $(PREFIX)/lib
+       cp $</BasicUsageEnvironment/libBasicUsageEnvironment.a $(PREFIX)/lib
+       cp $</groupsock/include/*.hh $</groupsock/include/*.h $(PREFIX)/include
+       cp $</liveMedia/include/*.hh $(PREFIX)/include
+       cp $</UsageEnvironment/include/*.hh $(PREFIX)/include
+       cp $</BasicUsageEnvironment/include/*.hh $(PREFIX)/include
        touch $@
 
 CLEAN_FILE += .live
@@ -1234,12 +1243,12 @@ goom: goom$(GOOM2k4_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
        patch -p0 < Patches/goom.patch
+       patch -p0 < Patches/goom2k4-0-mmx.patch
 endif
 ifdef HAVE_WIN32
        (cd $@; dos2unix configure.in)
        patch -p0 < Patches/goom2k4-0-win32.patch
 endif
-       patch -p0 < Patches/goom2k4-0-mmx.patch
 
 .goom2k4: goom
 ifdef HAVE_DARWIN_OS
@@ -1312,11 +1321,12 @@ x264-$(X264_VERSION).tar.gz:
 ifdef SVN
 x264: 
        $(SVN) co svn://svn.videolan.org/x264/trunk/ x264
+       patch -p0 < Patches/x264-svn-info-threads.patch
 ifdef HAVE_WIN32
        (cd x264; patch -p0 < ../Patches/x264-svn-win32.patch )
 endif
 ifdef HAVE_DARWIN_OS
-       (cd $@; patch -p 0 < ../Patches/x264-svn-darwin.patch )
+       (cd $@; patch -p0 < ../Patches/x264-svn-darwin.patch )
 endif
 else
 
@@ -1461,10 +1471,10 @@ DISTCLEAN_PKG += wxWidgets-$(WXWIDGETS_VERSION).tar.gz
 qt4-$(QT4_VERSION)-win32-bin.tar.bz2:
        $(WGET) $(QT4_URL)
 
-qt4: qt4-$(QT4_VERSION)-win32-bin.tar.bz2
+qt4_win32: qt4-$(QT4_VERSION)-win32-bin.tar.bz2
        $(EXTRACT_BZ2)
 
-.qt4: qt4
+.qt4_win32: qt4_win32
        (cd qt4;mkdir -p $(PREFIX)/bin; mkdir -p $(PREFIX)/include;mkdir -p $(PREFIX)/lib/pkgconfig;rm -f $(PREFIX)/lib/pkgconfig/Qt*; sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtCore.pc.in > $(PREFIX)/lib/pkgconfig/QtCore.pc;sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtGui.pc.in > $(PREFIX)/lib/pkgconfig/QtGui.pc;cp -r include/* $(PREFIX)/include;cp lib/*a $(PREFIX)/lib)
 ifeq ($(BUILD),i686-pc-cygwin)
        (cd qt4;cp bin/*.exe $(PREFIX)/bin)
@@ -1473,8 +1483,8 @@ else
 endif
        touch $@
 
-CLEAN_FILE += .qt4
-CLEAN_PKG += qt4
+CLEAN_FILE += .qt4_win32
+CLEAN_PKG += qt4_win32
 DISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.gz
 
 # ***************************************************************************
@@ -1484,7 +1494,7 @@ DISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.gz
 qt-win-opensource-$(QT4T_VERSION)-mingw.exe:
        wget $(QT4T_URL)
 
-Qt: qt-win-opensource-$(QT4T_VERSION)-mingw.exe
+Qt_win32: qt-win-opensource-$(QT4T_VERSION)-mingw.exe
        mkdir Qt
        7z -oQt x qt-win-opensource-$(QT4T_VERSION)-mingw.exe \$$OUTDIR/bin\ /bin \$$OUTDIR/bin\ /lib \$$OUTDIR/bin\ /include/QtCore \$$OUTDIR/bin\ /include/QtGui \$$OUTDIR/bin\ /src/gui \$$OUTDIR/bin\ /src/corelib \$$OUTDIR/bin\ /translations
        mv Qt/\$$OUTDIR/bin\ /* Qt/ && rmdir Qt/\$$OUTDIR/bin\  Qt/\$$OUTDIR
@@ -1496,7 +1506,7 @@ Qt: qt-win-opensource-$(QT4T_VERSION)-mingw.exe
        sed -e s,@@VERSION@@,$(QT4T_VERSION), -e s,@@PREFIX@@,$(PREFIX), Patches/QtCore.pc.in > Qt/lib/pkgconfig/QtCore.pc
        sed -e s,@@VERSION@@,$(QT4T_VERSION), -e s,@@PREFIX@@,$(PREFIX), Patches/QtGui.pc.in > Qt/lib/pkgconfig/QtGui.pc
 
-.Qt: Qt
+.Qt_win32: Qt_win32
        mkdir -p $(PREFIX)/bin $(PREFIX)/include/qt4/src $(PREFIX)/lib/pkgconfig $(PREFIX)/share/qt4/translations
        cp Qt/bin/moc.exe Qt/bin/rcc.exe Qt/bin/uic.exe $(PREFIX)/bin
        cp -r Qt/include/QtCore Qt/include/QtGui $(PREFIX)/include/qt4
@@ -1506,18 +1516,18 @@ Qt: qt-win-opensource-$(QT4T_VERSION)-mingw.exe
        cp Qt/translations/* $(PREFIX)/share/qt4/translations 
        touch $@
 
-CLEAN_FILE += .Qt
-CLEAN_PKG += Qt
+CLEAN_FILE += .Qt_win32
+CLEAN_PKG += Qt_win32
 DISTCLEAN_PKG += qt-win-opensource-$(QT4T_VERSION)-mingw.exe
 
 # ***************************************************************************
 # qt4 (source-code compilation for Mac)
 # ***************************************************************************
 
-qt-mac-opensource-src-$(QT4_VERSION).tar.gz:
+qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz:
        $(WGET) $(QT4_MAC_URL)
 
-qt4_mac: qt-mac-opensource-src-$(QT4_VERSION).tar.gz
+qt4_mac: qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .qt4_mac: qt4_mac
@@ -1526,7 +1536,7 @@ qt4_mac: qt-mac-opensource-src-$(QT4_VERSION).tar.gz
 
 CLEAN_FILE += .qt4_mac
 CLEAN_PKG += qt4_mac
-DISTCLEAN_PKG += qt-mac-opensource-src-$(QT4_VERSION).tar.gz
+DISTCLEAN_PKG += qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz
 
 # ***************************************************************************
 # zlib