[xiph-commits] r14944 - trunk/ffmpeg2theora

[j at svn.xiph.org]

Author: j
Date: 2008-05-23 02:50:30 -0700 (Fri, 23 May 2008)
New Revision: 14944

Removed:
   trunk/ffmpeg2theora/Makefile.mingw32
Modified:
   trunk/ffmpeg2theora/
   trunk/ffmpeg2theora/Makefile.am
   trunk/ffmpeg2theora/configure.ac
Log:
remove outdated Makefile, update version to svn


Property changes on: trunk/ffmpeg2theora
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2008-05-23 11:24:20.065999985 +0200
committer: j
properties: 
	branch-nick: ffmpeg2theora

   + timestamp: 2008-05-23 11:30:57.990999937 +0200
committer: j
properties: 
	branch-nick: ffmpeg2theora

Name: bzr:file-ids
   - subtitles.c	subtitles.c-20080523092315-berdpbqhudpfrkh7-1
subtitles.h	subtitles.h-20080523092316-79y08zf0g4v687h5-1

   + 
Name: bzr:revision-id:v3-single1-dHJ1bmsvZmZtcGVnMnRoZW9yYQ..
   - 191 j-20080517230830-he5x8v2m8yrfiw35
192 j-20080518224037-pkmoctzf4qce7tog
193 j-20080518224409-6hbfp3k2ssn6egqa
194 j-20080520111939-dhi52qwbqe7a47cu
195 j-20080523092252-gj9k9db0s67vl7dw
196 j-20080523092420-l0850yrq1qkgz9t0

   + 191 j-20080517230830-he5x8v2m8yrfiw35
192 j-20080518224037-pkmoctzf4qce7tog
193 j-20080518224409-6hbfp3k2ssn6egqa
194 j-20080520111939-dhi52qwbqe7a47cu
195 j-20080523092252-gj9k9db0s67vl7dw
196 j-20080523092420-l0850yrq1qkgz9t0
197 j-20080523093057-l5g0ezzy5geu0pey


Modified: trunk/ffmpeg2theora/Makefile.am
===================================================================
--- trunk/ffmpeg2theora/Makefile.am	2008-05-23 09:50:11 UTC (rev 14943)
+++ trunk/ffmpeg2theora/Makefile.am	2008-05-23 09:50:30 UTC (rev 14944)
@@ -2,12 +2,14 @@
 
 SUBDIRS = kino_export
 
-EXTRA_DIST = Makefile.mingw32 ffmpeg2theora.h theorautils.h get_ffmpeg_svn.sh ffmpeg2theora.1 \
-             get_libkate.sh subtitles.h subtitles.txt
+EXTRA_DIST = Makefile get_ffmpeg_svn.sh \
+             ffmpeg2theora.1 \
+             get_libkate.sh subtitles.txt
 
 bin_PROGRAMS = ffmpeg2theora
 
-ffmpeg2theora_SOURCES = ffmpeg2theora.c theorautils.c subtitles.c
+ffmpeg2theora_SOURCES = ffmpeg2theora.c theorautils.c subtitles.c \
+                        ffmpeg2theora.h theorautils.h subtitles.h
 ffmpeg2theora_LDFLAGS = -L$(prefix)/lib @XIPH_LIBS@ @KATE_LIBS@ @FFMPEG_LIBS@
 ffmpeg2theora_CFLAGS = @XIPH_CFLAGS@ @KATE_CFLAGS@ @FFMPEG_CFLAGS@
 

Deleted: trunk/ffmpeg2theora/Makefile.mingw32
===================================================================
--- trunk/ffmpeg2theora/Makefile.mingw32	2008-05-23 09:50:11 UTC (rev 14943)
+++ trunk/ffmpeg2theora/Makefile.mingw32	2008-05-23 09:50:30 UTC (rev 14944)
@@ -1,34 +0,0 @@
-#Makefile for ffmpeg2theora/mingw32
-#
-#
-
-CC=i586-mingw32msvc-gcc
-CFLAGS=-O3 -s -D_FILE_OFFSET_BITS=64
-
-MINGW32LIBS=/usr/local/win32/build/lib
-FFMPEG=/usr/local/win32/src/ffmpeg
-MINGW32INCLUDE=-I/usr/local/win32/build/include
-#LINKFLAGS= -static -ltheora -lvorbis -lvorbisenc -lz -lm  $(MINGW32LIBS)/avformat.dll $(MINGW32LIBS)/avcodec.dll -static
-LINKFLAGS=  -static $(MINGW32LIBS)/libtheora.a   $(FFMPEG)/libavformat/avformat.dll $(FFMPEG)/libavcodec/libavcodec.a  $(MINGW32LIBS)/libvorbis.a $(MINGW32LIBS)/libvorbisenc.a $(MINGW32LIBS)/libogg.a  -lz -lm 
-
-BIN=ffmpeg2theora.exe
-
-
-all: $(BIN)
-
-theorautils.o:
-	$(CC) $(CFLAGS) $(INCLUDE) $(MINGW32INCLUDE) $(MINGW32INCLUDE)/ffmpeg \
-	-c -o theorautils.o theorautils.c
-
-ffmpeg2theora.o:
-	$(CC) $(CFLAGS) $(INCLUDE) $(MINGW32INCLUDE) $(MINGW32INCLUDE)/ffmpeg \
-	-c -o ffmpeg2theora.o ffmpeg2theora.c
-
-$(BIN): ffmpeg2theora.o theorautils.o
-	$(CC) $(CFLAGS) -o $(BIN)  ffmpeg2theora.o theorautils.o \
-	$(LINKFLAGS) -L$(MINGW32LIBS) 
-	upx $(BIN)
-
-clean:
-	rm -f $(BIN)
-	rm -f *.o core *.core

Modified: trunk/ffmpeg2theora/configure.ac
===================================================================
--- trunk/ffmpeg2theora/configure.ac	2008-05-23 09:50:11 UTC (rev 14943)
+++ trunk/ffmpeg2theora/configure.ac	2008-05-23 09:50:30 UTC (rev 14944)
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT(ffmpeg2theora,0.21)
+AC_INIT(ffmpeg2theora,0.21+svn)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2])