From 567200693a8d45e7930a51270fbe22cbc054cb87 Mon Sep 17 00:00:00 2001
From: sam <sam@92316355-f0b4-4df1-b90c-862c8a59935f>
Date: Wed, 5 Aug 2009 14:10:02 +0000
Subject: [PATCH] Update the Linux build, following the makemovie code merge.

git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@3629 92316355-f0b4-4df1-b90c-862c8a59935f
---
 examples/Makefile.am | 11 ++++-------
 pipi/Makefile.am     |  5 +++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 6ba111f..870030b 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -3,7 +3,7 @@
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/pipi -I../pipi
 
 noinst_PROGRAMS = edd img2rubik sharpen floodfill line bezier histogram \
-	colorstring $(makemovie) $(storyboard) $(img2twit)
+	colorstring makemovie $(storyboard) $(img2twit)
 
 edd_SOURCES = edd.c
 edd_LDADD = ../pipi/libpipi.la
@@ -29,16 +29,13 @@ histogram_LDADD = ../pipi/libpipi.la
 colorstring_SOURCES = colorstring.c
 colorstring_LDADD = ../pipi/libpipi.la
 
+makemovie_SOURCES = makemovie.c
+makemovie_LDADD = ../pipi/libpipi.la
+
 if USE_FFMPEG
-makemovie = makemovie
 storyboard = storyboard
 endif
 
-makemovie_SOURCES = makemovie.c
-makemovie_LDADD = ../pipi/libpipi.la
-makemovie_CFLAGS = $(LIBAVFORMAT_CFLAGS) $(LIBAVCODEC_CFLAGS) $(LIBSWSCALE_CFLAGS)
-makemovie_LDFLAGS = $(LIBAVFORMAT_LIBS) $(LIBAVCODEC_LIBS) $(LIBSWSCALE_LIBS)
-
 storyboard_SOURCES = storyboard.c
 storyboard_LDADD = ../pipi/libpipi.la
 storyboard_CFLAGS = $(LIBAVFORMAT_CFLAGS) $(LIBAVCODEC_CFLAGS) $(LIBSWSCALE_CFLAGS)
diff --git a/pipi/Makefile.am b/pipi/Makefile.am
index 4b91346..0e73101 100644
--- a/pipi/Makefile.am
+++ b/pipi/Makefile.am
@@ -133,3 +133,8 @@ codec_libs += -ljpeg
 codec_sources += codec/jpeg.c
 endif
 
+if USE_FFMPEG
+codec_cflags += $(LIBAVFORMAT_CFLAGS) $(LIBAVCODEC_CFLAGS) $(LIBSWSCALE_CFLAGS)
+codec_libs += $(LIBAVFORMAT_LIBS) $(LIBAVCODEC_LIBS) $(LIBSWSCALE_LIBS)
+endif
+