reshuffled libraries

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 567e6b7..07a79c2 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -3,12 +3,9 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 include ../Makefile.common
 
-DEVICES = devices/file.$(O) devices/swf.$(O) devices/render.$(O) \
-          devices/arts.$(O) devices/record.$(O) devices/ops.$(O) \
-         devices/rescale.$(O) devices/bbox.$(O) #devices/lrf.$(O) devices/opengl.$(O)
-
-all: librfxswf$(A) libpdf$(A) q.$(O) mem.$(O) os.$(O) gfxtools.$(O) gfxfont.$(O) art/libart$(A) png.$(O) mp3.$(O) wav.$(O) $(DEVICES)
+DEVICES = devices/swf.$(O) #devices/lrf.$(O) devices/opengl.$(O)
 
+all: librfxswf$(A) libpdf$(A) art/libart$(A) devices/swf.$(O) libbase$(A) libgfx$(A)
 
 lame_objects = @lame_objects@
 
@@ -16,8 +13,8 @@ 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
 
-libpdf$(A): pdf/GFXOutputDev.cc pdf/GFXOutputDev.h pdf/pdf.cc pdf/pdf.h
-       cd pdf;$(MAKE) libpdf;cd ..
+base_objects=q.$(O) utf8.$(O) mem.$(O) png.$(O) wav.$(O) mp3.$(O) os.$(O) bitio.$(O) log.$(O) mem.$(O) 
+gfx_objects=gfxtools.$(O) gfxfont.$(O) devices/file.$(O) devices/render.$(O) devices/text.$(O) devices/record.$(O) devices/ops.$(O) devices/bbox.$(O)
 
 bitio.$(O): bitio.c bitio.h
        $(C) bitio.c -o $@
@@ -25,6 +22,8 @@ drawer.$(O): drawer.c drawer.h
        $(C) drawer.c -o $@
 q.$(O): q.c q.h $(top_builddir)/config.h
        $(C) q.c -o $@
+utf8.$(O): utf8.c utf8.h $(top_builddir)/config.h
+       $(C) utf8.c -o $@
 mem.$(O): mem.c mem.h $(top_builddir)/config.h
        $(C) mem.c -o $@
 png.$(O): png.c png.h $(top_builddir)/config.h
@@ -74,6 +73,8 @@ devices/arts.$(O):  devices/arts.c devices/arts.h devices/artsutils.c
        $(C) devices/arts.c -o devices/arts.$(O)
 devices/record.$(O):  devices/record.c devices/record.h
        $(C) devices/record.c -o devices/record.$(O)
+devices/text.$(O):  devices/text.c devices/text.h
+       $(C) devices/text.c -o devices/text.$(O)
 devices/ops.$(O):  devices/ops.c devices/ops.h
        $(C) devices/ops.c -o devices/ops.$(O)
 devices/rescale.$(O):  devices/rescale.c devices/rescale.h
@@ -83,10 +84,20 @@ 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)
 
-librfxswf$(A): Makefile rfxswf.$(O) drawer.$(O) bitio.$(O) log.$(O) MD5.$(O) mem.$(O) $(lame_objects) $(h263_objects) $(actioncompiler_objects)
-       $(AR) r librfxswf$(A) rfxswf.$(O) drawer.$(O) bitio.$(O) log.$(O) MD5.$(O) mem.$(O) $(lame_objects) $(h263_objects) $(actioncompiler_objects)
+libbase$(A): $(base_objects) Makefile
+       $(AR) r libbase$(A) $(base_objects)
+
+libgfx$(A): $(gfx_objects) Makefile
+       $(AR) r libgfx$(A) $(gfx_objects)
+
+librfxswf$(A): Makefile rfxswf.$(O) drawer.$(O) MD5.$(O) $(lame_objects) $(h263_objects) $(actioncompiler_objects) Makefile
+       $(AR) r librfxswf$(A) rfxswf.$(O) drawer.$(O) MD5.$(O) $(lame_objects) $(h263_objects) $(actioncompiler_objects)
        $(RANLIB) librfxswf$(A)
 
+libpdf$(A): pdf/GFXOutputDev.cc pdf/GFXOutputDev.h pdf/pdf.cc pdf/pdf.h
+       cd pdf;$(MAKE) libpdf;cd ..
+
+
 install:
 uninstall: