X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2FMakefile.in;h=9b193db719d68166090c9c66a816b1fdd0de0d25;hb=6a529bfa890997a55fec9ae0e0d388cf9d5276c2;hp=68c576104d2cd28981f7137a3830bb465f06278f;hpb=a91aabb88175ffbe045efce2795cefeaa17eff74;p=swftools.git

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 68c5761..9b193db 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -5,7 +5,7 @@ include ../Makefile.common
 
 DEVICES = devices/swf.$(O) #devices/lrf.$(O) devices/opengl.$(O)
 
-all: librfxswf$(A) libpdf$(A) libbase$(A) libgfx$(A) libgfxswf$(A) $(DEVICES)
+all: librfxswf$(A) libpdf$(A) libbase$(A) libgfx$(A) libgfxswf$(A) libocr$(A) $(DEVICES)
 
 lame_objects = @lame_objects@
 
@@ -17,9 +17,15 @@ base_objects=q.$(O) utf8.$(O) png.$(O) jpeg.$(O) wav.$(O) mp3.$(O) os.$(O) bitio
 gfx_objects=gfxtools.$(O) gfxfont.$(O) gfxpoly.$(O) devices/dummy.$(O) devices/file.$(O) devices/render.$(O) devices/text.$(O) devices/record.$(O) devices/ops.$(O) devices/polyops.$(O) devices/bbox.$(O) devices/rescale.$(O)
 art_objects=art/art_affine.$(O) art/art_alphagamma.$(O) art/art_bpath.$(O) art/art_gray_svp.$(O) art/art_misc.$(O) art/art_pixbuf.$(O) art/art_rect.$(O) art/art_rect_svp.$(O) art/art_rect_uta.$(O) art/art_render.$(O) art/art_render_gradient.$(O) art/art_render_mask.$(O) art/art_render_svp.$(O) art/art_rgb.$(O) art/art_rgb_a_affine.$(O) art/art_rgb_affine.$(O) art/art_rgb_affine_private.$(O) art/art_rgb_bitmap_affine.$(O) art/art_rgb_pixbuf_affine.$(O) art/art_rgb_rgba_affine.$(O) art/art_rgb_svp.$(O) art/art_rgba.$(O) art/art_svp.$(O) art/art_svp_intersect.$(O) art/art_svp_ops.$(O) art/art_svp_point.$(O) art/art_svp_render_aa.$(O) art/art_svp_vpath.$(O) art/art_svp_vpath_stroke.$(O) art/art_svp_wind.$(O) art/art_uta.$(O) art/art_uta_ops.$(O) art/art_uta_rect.$(O) art/art_uta_svp.$(O) art/art_uta_vpath.$(O) art/art_vpath.$(O) art/art_vpath_bpath.$(O) art/art_vpath_dash.$(O) art/art_vpath_svp.$(O)
 rfxswf_objects=modules/swfabc.$(O) modules/swfaction.$(O) modules/swfbits.$(O) modules/swfbutton.$(O) modules/swfcgi.$(O) modules/swfdraw.$(O) modules/swfdump.$(O) modules/swffilter.$(O) modules/swffont.$(O) modules/swfobject.$(O) modules/swfrender.$(O) modules/swfshape.$(O) modules/swfsound.$(O) modules/swftext.$(O) modules/swftools.$(O)
+ocr_objects=gocr/box.$(O) gocr/database.$(O) gocr/detect.$(O) gocr/job.$(O) gocr/lines.$(O) gocr/list.$(O) gocr/ocr0.$(O) gocr/ocr0n.$(O) gocr/ocr1.$(O) gocr/otsu.$(O) gocr/output.$(O) gocr/pgm2asc.$(O) gocr/pixel.$(O) gocr/progress.$(O) gocr/remove.$(O) gocr/unicode.$(O)
 
 %.$(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
@@ -86,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)
@@ -122,17 +126,22 @@ devices/bbox.$(O):  devices/bbox.c devices/bbox.h
 	$(C) devices/bbox.c -o devices/bbox.$(O)
 devices/lrf.$(O):  devices/lrf.c devices/lrf.h
 	$(C) devices/lrf.c -o devices/lrf.$(O)
+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)
 
+libocr$(A): $(ocr_objects) devices/ocr.$(O)
+	$(AR) r 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)