link all files using both gfx and swf into gfxswf.a

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 0491d85..6494160 100644 (file)
--- 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) $(DEVICES)
+all: librfxswf$(A) libpdf$(A) libbase$(A) libgfx$(A) libgfxswf$(A) $(DEVICES)
 
 lame_objects = @lame_objects@
 
@@ -13,7 +13,7 @@ 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)
 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
 
-base_objects=q.$(O) utf8.$(O) png.$(O) wav.$(O) mp3.$(O) os.$(O) bitio.$(O) log.$(O) mem.$(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)
 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)
@@ -32,6 +32,8 @@ mem.$(O): mem.c mem.h $(top_builddir)/config.h
        $(C) mem.c -o $@
 png.$(O): png.c png.h $(top_builddir)/config.h
        $(C) png.c -o $@
+jpeg.$(O): jpeg.c jpeg.h $(top_builddir)/config.h
+       $(C) jpeg.c -o $@
 mp3.$(O): mp3.c mp3.h $(top_builddir)/config.h
        $(C) mp3.c -o $@
 wav.$(O): wav.c wav.h $(top_builddir)/config.h
@@ -121,9 +123,17 @@ devices/bbox.$(O):  devices/bbox.c devices/bbox.h
 devices/lrf.$(O):  devices/lrf.c devices/lrf.h
        $(C) devices/lrf.c -o devices/lrf.$(O)
 
+readers/swf.$(O): readers/swf.c readers/swf.h
+       $(C) readers/swf.c -o readers/swf.$(O)
+readers/image.$(O): readers/image.c readers/image.h
+       $(C) readers/image.c -o readers/image.$(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)
+
 libgfx$(A): $(gfx_objects) $(art_objects) Makefile
        $(AR) r libgfx$(A) $(gfx_objects) $(art_objects)