git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e14cb1f
)
configure lame objects in lib/Makefile instead of in configure (Patrice Dumas)
author
kramm
<kramm>
Tue, 8 Jul 2008 09:27:11 +0000
(09:27 +0000)
committer
kramm
<kramm>
Tue, 8 Jul 2008 09:27:11 +0000
(09:27 +0000)
configure.in
patch
|
blob
|
history
lib/Makefile.in
patch
|
blob
|
history
diff --git
a/configure.in
b/configure.in
index
79ee333
..
0ad3077
100644
(file)
--- 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
[ --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
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_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])
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
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
(file)
--- 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)
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)
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)
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
$(RANLIB) librfxswf$(A)
libpdf$(A): pdf/GFXOutputDev.cc pdf/GFXOutputDev.h pdf/pdf.cc pdf/pdf.h