Update of /cvsroot/xine/xine-lib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5335
Modified Files:
Tag: ffmpeg_integration
Makefile.am configure.ac
Added Files:
Tag: ffmpeg_integration
Makefile.in
Log Message:
Start working on a branch where FFmpeg is not copied, patched and carved to be
built with automake but instead imported inline and built using its own build
system. This is an import of a slightly modified FFmpeg current tree. xine-lib
builds, install and run fine with it, but there are of course plenty of things
that needs to be fixed before it can even be considered for a 1.2.x series.
Work will continue in the next days of course.
--- NEW FILE: Makefile.in ---
# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@SET_MAKE@
###
srcdir = @srcdir@
[...1030 lines suppressed...]
mostlyclean-generic:
-rm -f *~ \#* .*~ .\#*
-rm -f $(PACKAGE)_$(VERSION).tar.gz
-rm -f $(distdir).tar.gz $(PACKAGE).tgz package_descriptions
-rm -rf $(distdir)
maintainer-clean-generic:
[EMAIL PROTECTED] "This command is intended for maintainers to use;"
[EMAIL PROTECTED] "it deletes files that may require special tools to
rebuild."
-rm -f Makefile.in configure acinclude.m4 aclocal.m4
-rm -f config.h.in stamp-h.in ltconfig ltmain.sh
-rm -f config.guess config.sub install-sh missing mkinstalldirs
-rm -f depcomp config.log
maintainer-clean-generic-hook:
rm -f config.status
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/Makefile.am,v
retrieving revision 1.47
retrieving revision 1.47.2.1
diff -u -r1.47 -r1.47.2.1
--- Makefile.am 31 Jul 2006 23:40:39 -0000 1.47
+++ Makefile.am 2 Dec 2006 01:19:48 -0000 1.47.2.1
@@ -6,7 +6,7 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = doc m4 po misc include lib src win32
+SUBDIRS = doc m4 po misc include lib src win32 contrib
DEBFILES = debian/README.Debian debian/changelog debian/control \
debian/copyright debian/rules debian/compat \
Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/xine-lib/configure.ac,v
retrieving revision 1.437
retrieving revision 1.437.2.1
diff -u -r1.437 -r1.437.2.1
--- configure.ac 5 Nov 2006 15:16:56 -0000 1.437
+++ configure.ac 2 Dec 2006 01:19:48 -0000 1.437.2.1
@@ -2404,6 +2404,8 @@
doc/man/en/Makefile
doc/hackersguide/Makefile
doc/faq/Makefile
+contrib/Makefile
+contrib/ffmpeg/makefile.xine
include/Makefile
include/xine.h
lib/Makefile
@@ -2438,15 +2440,6 @@
src/libfaad/Makefile
src/libfaad/codebook/Makefile
src/libffmpeg/Makefile
-src/libffmpeg/libavcodec/Makefile
-src/libffmpeg/libavcodec/armv4l/Makefile
-src/libffmpeg/libavcodec/i386/Makefile
-src/libffmpeg/libavcodec/mlib/Makefile
-src/libffmpeg/libavcodec/alpha/Makefile
-src/libffmpeg/libavcodec/ppc/Makefile
-src/libffmpeg/libavcodec/sparc/Makefile
-src/libffmpeg/libavcodec/libpostproc/Makefile
-src/libffmpeg/libavutil/Makefile
src/libflac/Makefile
src/liblpcm/Makefile
src/libmad/Makefile
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
