From b04122f3f7884de08eb5d59bb3fd2bff829f9039 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Sun, 22 May 2005 15:49:22 +0000
Subject: Added multithreaded encoding support.

---
 src/Makefile.am | 47 +++++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 2bdb4dc..499e49b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,3 @@
-#frekin' wierd
-## TODO: Move ffmpeg, libxml and libsdl into configure.in
-
 AM_CXXFLAGS := $(CXXFLAGS) $(EXTRA_CXXFLAGS) -I../include $(QT_CXXFLAGS) \
 	-DQT_THREAD_SUPPORT \
 	-DPIXMAPS=\"$(datadir)/pixmaps\" \
@@ -11,59 +8,61 @@ bin_PROGRAMS = miav
 miav_SOURCES = $(shell  if [ $QT_CXXFLAGS ] ; then ../tools/MocList cc; fi ) \
 	aboutwindow.cc \
 	camera.cc \
+	cprquerydialog.cc \
 	decoder.cc \
+	dv1394.cc \
 	encoder.cc \
 	frame.cc \
+	img_encoder.cc \
+	info_console.cc \
+	info_gui.cc \
 	mainwindow.cc \
-	cprquerydialog.cc \
+	messagebox.cc \
 	miav.cc \
+	miav_config.cc \
+	mov_encoder.cc \
+	mov_encoder_thread.cc \
+	mov_encoder_writer.cc \
 	network.cc \
 	player.cc \
+	server.cc \
+	server_status.cc \
 	socket.cc \
 	thread.cc \
 	util.cc \
-	videowidget.cc \
-	messagebox.cc \
-	miav_config.cc \
-	mov_encoder.cc \
-	img_encoder.cc \
-	server.cc \
-	dv1394.cc \
-	server_status.cc \
-	info_gui.cc \
-	info_console.cc \
-	mov_encoder_thread.cc
+	videowidget.cc
 
 EXTRA_DIST = \
 	aboutwindow.h \
 	camera.h \
 	cprquerydialog.h \
+	debug.h \
 	decoder.h \
+	dv.h \
+	dv1394.h \
 	encoder.h \
 	frame.h \
 	img_encoder.h \
+	info.h \
+	info_console.h \
+	info_gui.h \
 	mainwindow.h \
 	messagebox.h \
 	miav.h \
 	miav_config.h \
 	mov_encoder.h \
+	mov_encoder_thread.h \
+	mov_encoder_writer.h \
 	network.h \
 	package.h \
 	player.h \
 	queue.h \
 	server.h \
+	server_status.h \
 	socket.h \
 	thread.h \
 	util.h \
-	videowidget.h \
-	debug.h \
-	dv.h \
-	dv1394.h \
-	server_status.h \
-	info.h \
-	info_gui.h \
-	info_console.h \
-	mov_encoder_thread.h
+	videowidget.h
 
 miav_LDADD := $(shell  if [ $QT_CXXFLAGS ] ; then ../tools/MocList o; fi )
 
-- 
cgit v1.2.3