From 42834fabcae7a30ff40887d334dfb871bf2cb35b Mon Sep 17 00:00:00 2001
From: kramm <kramm>
Date: Tue, 8 Jul 2008 09:27:11 +0000
Subject: [PATCH] configure lame objects in lib/Makefile instead of in
 configure (Patrice Dumas)

---
 configure.in    |    8 ++++----
 lib/Makefile.in |    8 +++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/configure.in b/configure.in
index 79ee333..0ad3077 100644
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@ AC_ARG_ENABLE(lame,
 [  --disable-lame          don't compile any L.A.M.E. mp3 encoding code in], DISABLE_LAME=true)
 
 PACKAGE=swftools
-VERSION=2008-06-08-1156
+VERSION=2008-06-23-2005
 
 
 # ------------------------------------------------------------------
@@ -259,14 +259,14 @@ RFX_CHECK_FREETYPE
 
 RFX_CHECK_FONTCONFIG
 
-lame_objects= 
+lame_in_source= 
 lame_makefile=
 if test "x${DISABLE_LAME}" = "xtrue"; then
     echo "*" Disabling lame support...
 else
     # old lame code at lib/lame
     if test -f lib/lame/Makefile.in; then
-	lame_objects="lame/psymodel.\$(O) lame/fft.\$(O) lame/newmdct.\$(O) lame/quantize.\$(O) lame/takehiro.\$(O) lame/reservoir.\$(O) lame/quantize_pvt.\$(O) lame/vbrquantize.\$(O) lame/encoder.\$(O) lame/id3tag.\$(O) lame/version.\$(O) lame/tables.\$(O) lame/util.\$(O) lame/bitstream.\$(O) lame/set_get.\$(O) lame/VbrTag.\$(O) lame/lame.\$(O)"
+	lame_in_source='$(lame_objects)'
 	lame_makefile="lib/lame/Makefile"
 	CPPFLAGS="$CPPFLAGS -Ilame"
 	AC_DEFINE([HAVE_LAME], [1], [have/use internal l.a.m.e. mp3 library])
@@ -285,7 +285,7 @@ else
 	fi
     fi
 fi
-AC_SUBST(lame_objects)
+AC_SUBST(lame_in_source)
 
 # ------------------------------------------------------------------
  
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 9b193db..41d1732 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -7,7 +7,9 @@ DEVICES = devices/swf.$(O) #devices/lrf.$(O) devices/opengl.$(O)
 
 all: librfxswf$(A) libpdf$(A) libbase$(A) libgfx$(A) libgfxswf$(A) libocr$(A) $(DEVICES)
 
-lame_objects = @lame_objects@
+lame_objects = lame/psymodel.$(O) lame/fft.$(O) lame/newmdct.$(O) lame/quantize.$(O) lame/takehiro.$(O) lame/reservoir.$(O) lame/quantize_pvt.$(O) lame/vbrquantize.$(O) lame/encoder.$(O) lame/id3tag.$(O) lame/version.$(O) lame/tables.$(O) lame/util.$(O) lame/bitstream.$(O) lame/set_get.$(O) lame/VbrTag.$(O) lame/lame.$(O)
+
+lame_in_source = @lame_in_source@
 
 h263_objects = h.263/dct.$(O) h.263/h263tables.$(O) h.263/swfvideo.$(O)
 actioncompiler_objects = action/assembler.$(O) action/compile.$(O) action/lex.swf4.$(O) action/lex.swf5.$(O) action/libming.$(O) action/swf4compiler.tab.$(O) action/swf5compiler.tab.$(O) action/actioncompiler.$(O)
@@ -146,8 +148,8 @@ libgfxswf$(A): devices/swf.$(O) readers/swf2.$(O) readers/image.$(O)
 libgfx$(A): $(gfx_objects) $(art_objects) Makefile
 	$(AR) r libgfx$(A) $(gfx_objects) $(art_objects)
 
-librfxswf$(A): Makefile $(rfxswf_objects) rfxswf.$(O) drawer.$(O) MD5.$(O) $(lame_objects) $(h263_objects) $(actioncompiler_objects) Makefile
-	$(AR) r librfxswf$(A) $(rfxswf_objects) rfxswf.$(O) drawer.$(O) MD5.$(O) $(lame_objects) $(h263_objects) $(actioncompiler_objects)
+librfxswf$(A): Makefile $(rfxswf_objects) rfxswf.$(O) drawer.$(O) MD5.$(O) $(lame_in_source) $(h263_objects) $(actioncompiler_objects) Makefile
+	$(AR) r librfxswf$(A) $(rfxswf_objects) rfxswf.$(O) drawer.$(O) MD5.$(O) $(lame_in_source) $(h263_objects) $(actioncompiler_objects)
 	$(RANLIB) librfxswf$(A)
 
 libpdf$(A): pdf/GFXOutputDev.cc pdf/GFXOutputDev.h pdf/pdf.cc pdf/pdf.h
-- 
1.7.10.4