X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2FMakefile.in;h=9b193db719d68166090c9c66a816b1fdd0de0d25;hb=2b277306fe268fb42630f980ec950988c93c6158;hp=b83e8225759de2244cd326eadbc5a6b7cfbe2854;hpb=e8fe2f290123fc66181709a8a5263ad9e91c6939;p=swftools.git

diff --git a/lib/Makefile.in b/lib/Makefile.in
index b83e822..9b193db 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -21,6 +21,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 +92,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,8 +129,8 @@ 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/swf.$(O): readers/swf.c readers/swf.h
-	$(C) readers/swf.c -o readers/swf.$(O)
+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)
 
@@ -137,8 +140,8 @@ libocr$(A): $(ocr_objects) devices/ocr.$(O)
 libbase$(A): $(base_objects) Makefile
 	$(AR) r libbase$(A) $(base_objects)
 
-libgfxswf$(A): devices/swf.$(O) readers/swf.$(O) readers/image.$(O)
-	$(AR) r libgfxswf$(A) devices/swf.$(O) readers/swf.$(O) readers/image.$(O)
+libgfxswf$(A): devices/swf.$(O) readers/swf2.$(O) readers/image.$(O)
+	$(AR) r 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)