X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=lib%2FMakefile.in;h=41d1732431da1fe9c130844ead515e187d96f1bf;hb=42834fabcae7a30ff40887d334dfb871bf2cb35b;hp=04d0614d2ce8445c74efab449d90bc87b8279d35;hpb=d4e0ae0071722b1cc50bfc41fe64066783aa24a5;p=swftools.git

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 04d0614..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)
@@ -21,6 +23,11 @@ ocr_objects=gocr/box.$(O) gocr/database.$(O) gocr/detect.$(O) gocr/job.$(O) gocr
 
 %.$(O): %.c 
 	$(C) $< -o $@
+lame/%.$(O): lame/%.$(C)
+	$(C) $< -o $@
+action/%.$(O): action/%.$(C)
+	$(C) $< -o $@
+
 bitio.$(O): bitio.c bitio.h
 	$(C) bitio.c -o $@
 drawer.$(O): drawer.c drawer.h
@@ -87,10 +94,8 @@ log.$(O): log.c log.h
 rfxswf.$(O): rfxswf.c rfxswf.h drawer.h bitio.h log.h MD5.h $(top_builddir)/config.h
 	$(C) rfxswf.c -o $@
 
-$(lame_objects):
-	cd lame;$(MAKE) all;cd ..
-$(actioncompiler_objects):
-	cd action;$(MAKE) all;cd ..
+#$(actioncompiler_objects):
+#	cd action;$(MAKE) all;cd ..
 
 h.263/dct.$(O):  h.263/dct.c h.263/dct.h
 	$(C) h.263/dct.c -o h.263/dct.$(O)
@@ -126,7 +131,7 @@ devices/lrf.$(O):  devices/lrf.c devices/lrf.h
 devices/ocr.$(O): devices/ocr.c devices/ocr.h gocr/gocr.h
 	$(C) devices/ocr.c -o devices/ocr.$(O)
 
-readers/swf2.$(O): readers/swf2.c readers/swf.h
+readers/swf2.$(O): readers/swf.c readers/swf.h
 	$(C) readers/swf.c -o readers/swf2.$(O)
 readers/image.$(O): readers/image.c readers/image.h
 	$(C) readers/image.c -o readers/image.$(O)
@@ -143,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