X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2FMakefile.in;h=bdd208dbcf588df1a8b157c0db5997d0c5224640;hp=bac79e8d8f2682460359488dbe869560b0b80698;hb=f9843bbeaa52fe428420eed8d2c8992f763a8d68;hpb=498be3bee54c20a41b9478383cf324aa507c1e6c

diff --git a/lib/Makefile.in b/lib/Makefile.in
index bac79e8..bdd208d 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -3,27 +3,25 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 include ../Makefile.common
 
-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) libgfxpdf$(A) libbase$(A) libgfx$(A) libgfxswf$(A) libocr$(A)
 
 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)
-actioncompiler_in_source = $(actioncompiler_objects)
+as12compiler_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)
+as12compiler_in_source = $(as12compiler_objects)
 
-rfxswf_modules =  modules/swfbits.c modules/swfaction.c modules/swfdump.c modules/swfcgi.c modules/swfbutton.c modules/swftext.c modules/swffont.c modules/swftools.c modules/swfsound.c modules/swfshape.c modules/swfobject.c modules/swfdraw.c modules/swffilter.c modules/swfrender.c h.263/swfvideo.c
+as3compiler_objects = as3/abc.$(O) as3/pool.$(O) as3/files.$(O) as3/opcodes.$(O) as3/code.$(O) as3/registry.$(O) as3/builtin.$(O) as3/parser.tab.$(O) as3/tokenizer.yy.$(O) as3/scripts.$(O) as3/compiler.$(O) as3/import.$(O) as3/expr.$(O) as3/common.$(O) as3/initcode.$(O) as3/assets.$(O)
+gfxpoly_objects = gfxpoly/active.$(O) gfxpoly/convert.$(O) gfxpoly/poly.$(O) gfxpoly/renderpoly.$(O) gfxpoly/stroke.$(O) gfxpoly/wind.$(O) gfxpoly/xrow.$(O)
 
-base_objects=q.$(O) utf8.$(O) png.$(O) jpeg.$(O) wav.$(O) mp3.$(O) os.$(O) bitio.$(O) log.$(O) mem.$(O) 
-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) @DEVICE_OPENGL@
+rfxswf_modules =  modules/swfbits.c modules/swfaction.c modules/swfdump.c modules/swfcgi.c modules/swfbutton.c modules/swftext.c modules/swffont.c modules/swftools.c modules/swfsound.c modules/swfshape.c modules/swfobject.c modules/swfdraw.c modules/swffilter.c modules/swfrender.c h.263/swfvideo.c modules/swfalignzones.c
 
-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)
-art_in_source = @art_in_source@
+base_objects=q.$(O) utf8.$(O) png.$(O) jpeg.$(O) wav.$(O) mp3.$(O) os.$(O) bitio.$(O) log.$(O) mem.$(O) MD5.$(O) xml.$(O) ttf.$(O)
+gfx_objects=gfximage.$(O) gfxtools.$(O) gfxfont.$(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) @DEVICE_OPENGL@ @DEVICE_PDF@
 
-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)
+rfxswf_objects=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) modules/swfalignzones.$(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 
@@ -32,6 +30,10 @@ lame/%.$(O): lame/%.c
 	$(C) $< -o $@
 action/%.$(O): action/%.c
 	$(C) $< -o $@
+as3/%.$(O): as3/%.c
+	$(C) $< -o $@
+gfxpoly/%.$(O): gfxpoly/%.c
+	$(C) $< -o $@
 
 bitio.$(O): bitio.c bitio.h
 	$(C) bitio.c -o $@
@@ -51,10 +53,12 @@ mp3.$(O): mp3.c mp3.h $(top_builddir)/config.h
 	$(C) mp3.c -o $@
 wav.$(O): wav.c wav.h $(top_builddir)/config.h
 	$(C) wav.c -o $@
+xml.$(O): xml.c xml.h bitio.h
+	$(C) xml.c -o $@
+ttf.$(O): ttf.c ttf.h
+	$(C) ttf.c -o $@
 os.$(O): os.c os.h $(top_builddir)/config.h
 	$(C) -DSWFTOOLS_DATADIR=\"$(pkgdatadir)\" os.c -o $@
-modules/swfabc.$(O): modules/swfabc.c rfxswf.h
-	$(C) modules/swfabc.c -o $@
 modules/swfaction.$(O): modules/swfaction.c rfxswf.h
 	$(C) modules/swfaction.c -o $@
 modules/swfbits.$(O): modules/swfbits.c rfxswf.h
@@ -69,6 +73,8 @@ modules/swfdump.$(O): modules/swfdump.c rfxswf.h
 	$(C) modules/swfdump.c -o $@
 modules/swffilter.$(O): modules/swffilter.c rfxswf.h
 	$(C) modules/swffilter.c -o $@
+modules/swfalignzones.$(O): modules/swfalignzones.c graphcut.c graphcut.h rfxswf.h
+	$(C) modules/swfalignzones.c -o $@
 modules/swffont.$(O): modules/swffont.c rfxswf.h
 	$(C) modules/swffont.c -o $@
 modules/swfobject.$(O): modules/swfobject.c rfxswf.h
@@ -83,11 +89,11 @@ modules/swftext.$(O): modules/swftext.c rfxswf.h
 	$(C) modules/swftext.c -o $@
 modules/swftools.$(O): modules/swftools.c rfxswf.h
 	$(C) modules/swftools.c -o $@
+gfximage.$(O): gfximage.c gfximage.h gfxdevice.h $(top_builddir)/config.h
+	$(C) gfximage.c -o $@
 gfxtools.$(O): gfxtools.c gfxtools.h $(top_builddir)/config.h
 	$(C) gfxtools.c -o $@
-gfxpoly.$(O): gfxpoly.c gfxpoly.h $(top_builddir)/config.h
-	$(C) gfxpoly.c -o $@
-gfxfont.$(O): gfxfont.c gfxfont.h $(top_builddir)/config.h
+gfxfont.$(O): gfxfont.c gfxfont.h ttf.h $(top_builddir)/config.h
 	$(C) gfxfont.c -o $@
 gfxwindow.$(O): gfxwindow_win32.c gfxwindow_unix.c gfxwindow.c gfxwindow.h
 	$(C) gfxwindow.c -o $@
@@ -96,10 +102,11 @@ MD5.$(O): MD5.c MD5.h
 	$(C) MD5.c -o $@
 log.$(O): log.c log.h
 	$(C) log.c -o $@
+
 rfxswf.$(O): rfxswf.c rfxswf.h drawer.h bitio.h log.h MD5.h $(top_builddir)/config.h
 	$(C) rfxswf.c -o $@
 
-#$(actioncompiler_objects):
+#$(as12compiler_objects):
 #	cd action;$(MAKE) all;cd ..
 
 h.263/dct.$(O):  h.263/dct.c h.263/dct.h
@@ -143,29 +150,36 @@ readers/image.$(O): readers/image.c readers/image.h
 
 libocr$(A): $(ocr_objects) devices/ocr.$(O)
 	$(AR) r libocr$(A) $(ocr_objects) devices/ocr.$(O)
+	$(RANLIB) libocr$(A)
 
 libbase$(A): $(base_objects) Makefile
 	$(AR) r libbase$(A) $(base_objects)
+	$(RANLIB) libbase$(A)
 
 libgfxswf$(A): devices/swf.$(O) readers/swf2.$(O) readers/image.$(O)
 	$(AR) r libgfxswf$(A) devices/swf.$(O) readers/swf2.$(O) readers/image.$(O)
+	$(RANLIB) libgfxswf$(A)
 
-libgfx$(A): $(gfx_objects) $(art_in_source) Makefile
-	$(AR) r libgfx$(A) $(gfx_objects) $(art_in_source)
+libgfx$(A): $(gfx_objects) $(gfxpoly_objects) Makefile
+	$(AR) r libgfx$(A) $(gfx_objects) $(gfxpoly_objects)
+	$(RANLIB) libgfx$(A)
 
-librfxswf$(A): Makefile $(rfxswf_objects) rfxswf.$(O) drawer.$(O) MD5.$(O) $(lame_in_source) $(h263_objects) $(actioncompiler_in_source) Makefile
-	$(AR) r librfxswf$(A) $(rfxswf_objects) rfxswf.$(O) drawer.$(O) MD5.$(O) $(lame_in_source) $(h263_objects) $(actioncompiler_in_source)
+librfxswf$(A): Makefile $(rfxswf_objects) rfxswf.$(O) drawer.$(O) $(lame_in_source) $(h263_objects) $(as12compiler_in_source) $(as3compiler_objects) Makefile
+	$(AR) r librfxswf$(A) $(rfxswf_objects) rfxswf.$(O) drawer.$(O) $(lame_in_source) $(h263_objects) $(as12compiler_in_source) $(as3compiler_objects)
 	$(RANLIB) librfxswf$(A)
 
-libpdf$(A): pdf/GFXOutputDev.cc pdf/GFXOutputDev.h pdf/pdf.cc pdf/pdf.h
-	cd pdf;$(MAKE) libpdf
+libgfxpdf$(A): pdf/GFXOutputDev.cc pdf/GFXOutputDev.h pdf/pdf.cc pdf/pdf.h
+	cd pdf;$(MAKE) libgfxpdf
+
+tests: png.test.c
+	$(L) png.test.c -o png.test $(LIBS)
 
 install:
 uninstall:
 
 clean: 
 	rm -f *.o *.obj *.lo *.a *.lib *.la gmon.out
-	for dir in art modules devices swf h.263;do rm -f $$dir/*.o $$dir/*.obj $$dir/*.lo $$dir/*.a $$dir/*.lib $$dir/*.la $$dir/gmon.out;done
+	for dir in modules devices swf as3 readers art gocr h.263 gfxpoly;do rm -f $$dir/*.o $$dir/*.obj $$dir/*.lo $$dir/*.a $$dir/*.lib $$dir/*.la $$dir/gmon.out;done
 	cd lame && $(MAKE) clean && cd .. || true
 	cd action && $(MAKE) clean && cd ..
 	cd python && $(MAKE) clean && cd ..