From 0332e496347f6b563abb86d4ef9650bbd6ebc3e1 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Wed, 28 May 2014 15:05:57 +0200
Subject: Port server to hugin.

---
 src/Makefile.am | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 3e93b4b..fa948df 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,12 +13,13 @@ AM_CXXFLAGS = $(QT_CFLAGS)
 
 miav_CXXFLAGS = $(SDL_CFLAGS) $(DV_CFLAGS) $(IEC61883_CFLAGS) $(QT_CFLAGS) \
 	-I../include -DPIXMAPS=\"$(datadir)/pixmaps\" \
-	-DETC=\"$(prefix)/etc/miav\"
+	-DETC=\"$(prefix)/etc/miav\" -I$(top_srcdir)/hugin
 
 miav_LDADD = $(shell ../tools/MocList o) $(QT_LIBS) $(IEC61883_LIBS) \
 	$(SDL_LIBS) $(DV_LIBS)
 
 miav_SOURCES = \
+	$(top_srcdir)/hugin/hugin.c \
 	aa_socket.cc \
 	cprlisten.cc \
 	aboutwindow.cc \
@@ -35,31 +36,32 @@ miav_SOURCES = \
 	mainwindow.cc \
 	messagebox.cc \
 	miav.cc \
-	miav_config.cc \
-	network.cc \
 	player.cc \
 	recedge.cc \
+	videowidget.cc \
+	yuv_draw.cc \
+\
 	socket.cc \
 	thread.cc \
 	util.cc \
-	videowidget.cc \
-	yuv_draw.cc
+	miav_config.cc \
+	network.cc
+
 
 miavd_CXXFLAGS = $(JPEG_CFLAGS) $(FAME_CFLAGS) $(LAME_CFLAGS) $(DV_CFLAGS) \
-	 $(PTHREAD_CFLAGS) -I../include -DETC=\"$(prefix)/etc/miav\"
+	 $(PTHREAD_CFLAGS) -I../include -DETC=\"$(prefix)/etc/miav\" \
+	-I$(top_srcdir)/hugin
 
 miavd_LDADD = $(JPEG_LIBS) $(FAME_LIBS) $(LAME_LIBS) $(DV_LIBS) $(PTHREAD_LIBS)
 
 miavd_SOURCES = \
+	$(top_srcdir)/hugin/hugin.c \
 	miavd.cc \
 	audio_encoder.cc \
 	daemon.cc \
 	file.cc \
 	frame.cc \
 	img_encoder.cc \
-	info.cc \
-	info_console.cc \
-	info_simple.cc \
 	jpeg_mem_dest.cc \
 	libfame_wrapper.cc \
 	liblame_wrapper.cc \
-- 
cgit v1.2.3