From c0c9d99700c4d7c1080072c3882f6e101cdf71cc Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Mon, 13 Jul 2009 22:30:49 +0000
Subject: [PATCH] Build changes for the new ffms, TheFluff will be comitting
 the aegisub changes shortly.

Originally committed to SVN as r3117.
---
 aegisub/Makefile.am         |  2 +-
 aegisub/configure.in        |  4 +--
 aegisub/libffms/Makefile.am | 52 +++++++++++++++++--------------------
 aegisub/src/Makefile.am     |  4 +--
 4 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am
index 7f9e94dc2..0679a62c1 100644
--- a/aegisub/Makefile.am
+++ b/aegisub/Makefile.am
@@ -10,7 +10,7 @@ libass = libass
 endif
 
 if HAVE_PROVIDER_FFMPEGSOURCE
-ffmpegsource = FFmpegSource2
+ffmpegsource = libffms
 endif
 
 SUBDIRS = \
diff --git a/aegisub/configure.in b/aegisub/configure.in
index 52c262e02..18b0e9e5f 100644
--- a/aegisub/configure.in
+++ b/aegisub/configure.in
@@ -41,7 +41,7 @@ AM_INIT_AUTOMAKE
 AC_CONFIG_HEADER([acconf.h])
 AC_GNU_SOURCE
 AC_CANONICAL_HOST
-
+AM_PROG_CC_C_O
 
 ###########################
 # Check target architecture
@@ -1288,7 +1288,7 @@ src/libresrc/Makefile
 src/libauto3/Makefile
 src/libosxutil/Makefile
 universalchardet/Makefile
-FFmpegSource2/Makefile
+libffms/Makefile
 libass/Makefile
 automation/Makefile
 po/Makefile.in
diff --git a/aegisub/libffms/Makefile.am b/aegisub/libffms/Makefile.am
index 9b3a956a6..7e4cd992f 100644
--- a/aegisub/libffms/Makefile.am
+++ b/aegisub/libffms/Makefile.am
@@ -1,32 +1,28 @@
-noinst_LIBRARIES = libffmpegsource2_aegisub.a
+AUTOMAKE_OPTIONS = subdir-objects
 
-AM_CPPFLAGS = -I../src -D__UNIX__ -DFFMS_EXPORTS -DHAVE_STRLCPY @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBPOSTPROC_CFLAGS@
+noinst_LIBRARIES = libffmpegsource_aegisub.a
+
+AM_CPPFLAGS = -I../src -Icore -Iinclude -D__UNIX__ -DFFMS_EXPORTS -DHAVE_STRLCPY @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBPOSTPROC_CFLAGS@
 
 
-libffmpegsource2_aegisub_a_SOURCES = \
-	ffaudiosource.cpp \
-	ffms.cpp \
-	ffvideosource.cpp \
-	indexing.cpp \
-	MatroskaParser.c \
-	stdiostream.c \
-	utils.cpp \
-	wave64writer.cpp
+libffmpegsource_aegisub_a_SOURCES = \
+	src/core/ffaudiosource.cpp \
+	src/core/ffhaaliaudio.cpp \
+	src/core/ffhaaliindexer.cpp \
+	src/core/ffhaalivideo.cpp \
+	src/core/fflavfaudio.cpp \
+	src/core/fflavfindexer.cpp \
+	src/core/fflavfvideo.cpp \
+	src/core/ffmatroskaaudio.cpp \
+	src/core/ffmatroskaindexer.cpp \
+	src/core/ffmatroskavideo.cpp \
+	src/core/ffms.cpp \
+	src/core/ffvideosource.cpp \
+	src/core/indexing.cpp \
+	src/core/matroskaparser.c \
+	src/core/stdiostream.c \
+	src/core/utils.cpp \
+	src/core/wave64writer.cpp
 
-
-libffmpegsource2_aegisub_a_SOURCES += \
-	MatroskaParser.h \
-	avisynth.h \
-	ffaudiosource.h \
-	ffavisynth.h \
-	ffms.h \
-	ffpp.h \
-	ffswscale.h \
-	ffvideosource.h \
-	indexing.h \
-	stdiostream.h \
-	utils.h \
-	wave64writer.h
-
-EXTRA_DIST = \
-	ffms2.html
+libffmpegsource_aegisub_a_SOURCES += \
+	core/*.h
diff --git a/aegisub/src/Makefile.am b/aegisub/src/Makefile.am
index 1ac95eb8f..8b84758b0 100644
--- a/aegisub/src/Makefile.am
+++ b/aegisub/src/Makefile.am
@@ -18,7 +18,7 @@ SUBDIRS = \
 	$(libauto3) \
 	$(libosxutil_subdir)
 
-AM_CXXFLAGS = -DAEGISUB -Iinclude @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ -I../FFmpegSource2
+AM_CXXFLAGS = -DAEGISUB -Iinclude @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ -I../libffms/include
 
 bin_PROGRAMS = aegisub-2.1
 aegisub_2_1_LDADD = libresrc/libresrc.a $(libosxutil_lib)
@@ -81,7 +81,7 @@ if HAVE_PROVIDER_FFMPEGSOURCE
 noinst_LIBRARIES += libaudiovideo_ffmpegsource.a
 libaudiovideo_ffmpegsource_a_SOURCES = audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpegsource_common.cpp
 libaudiovideo_ffmpegsource_a_CPPFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBPOSTPROC_CFLAGS@
-aegisub_2_1_LDADD += libaudiovideo_ffmpegsource.a ../FFmpegSource2/libffmpegsource2_aegisub.a
+aegisub_2_1_LDADD += libaudiovideo_ffmpegsource.a ../libffms/libffmpegsource_aegisub.a
 aegisub_2_1_LDFLAGS += @LIBPOSTPROC_LIBS@
 endif