From 35555ed5f79092c3829c49cfc15ce7e82fb6fab0 Mon Sep 17 00:00:00 2001 From: Matthias Kramm Date: Wed, 21 Jan 2009 16:48:55 -0800 Subject: [PATCH] added pdf dependencies --- Makefile.new.in | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Makefile.new.in b/Makefile.new.in index aefc0c1..b2b2bab 100644 --- a/Makefile.new.in +++ b/Makefile.new.in @@ -23,9 +23,9 @@ h263_objects = lib/h.263/dct.$(O) lib/h.263/h263tables.$(O) lib/h.263/swfvideo.$ as12compiler_objects = lib/action/assembler.$(O) lib/action/compile.$(O) lib/action/lex.swf4.$(O) lib/action/lex.swf5.$(O) lib/action/libming.$(O) lib/action/swf4compiler.tab.$(O) lib/action/swf5compiler.tab.$(O) lib/action/actioncompiler.$(O) as12compiler_in_source = $(as12compiler_objects) -as3compiler_objects = lib/as3/abc.$(O) lib/as3/utils.$(O) lib/as3/files.$(O) +as3compiler_objects = lib/as3/abc.$(O) lib/as3/pool.$(O) lib/as3/files.$(O) lib/as3/opcodes.$(O) lib/as3/code.$(O) lib/as3/registry.$(O) lib/as3/builtin.$(O) lib/as3/compiler.$(O) lib/as3/parser.tab.$(O) lib/as3/tokenizer.yy.$(O) -rfxswf_modules = lib/modules/swfbits.c lib/modules/swfaction.c lib/modules/swfdump.c lib/modules/swfcgi.c lib/modules/swfbutton.c lib/modules/swftext.c lib/modules/swffont.c lib/modules/swftools.c lib/modules/swfsound.c lib/modules/swfshape.c lib/modules/swfobject.c lib/modules/swfdraw.c lib/modules/swffilter.c lib/modules/swfrender.c lib/h.263/swfvideo.c +rfxswf_modules = lib/modules/swfbits.$(O) lib/modules/swfaction.$(O) lib/modules/swfdump.$(O) lib/modules/swfcgi.$(O) lib/modules/swfbutton.$(O) lib/modules/swftext.$(O) lib/modules/swffont.$(O) lib/modules/swftools.$(O) lib/modules/swfsound.$(O) lib/modules/swfshape.$(O) lib/modules/swfobject.$(O) lib/modules/swfdraw.$(O) lib/modules/swffilter.$(O) lib/modules/swfrender.$(O) lib/h.263/swfvideo.$(O) base_objects=lib/q.$(O) lib/utf8.$(O) lib/png.$(O) lib/jpeg.$(O) lib/wav.$(O) lib/mp3.$(O) lib/os.$(O) lib/bitio.$(O) lib/log.$(O) lib/mem.$(O) gfx_objects=lib/gfxtools.$(O) lib/gfxfont.$(O) lib/gfxpoly.$(O) lib/devices/dummy.$(O) lib/devices/file.$(O) lib/devices/render.$(O) lib/devices/text.$(O) lib/devices/record.$(O) lib/devices/ops.$(O) lib/devices/polyops.$(O) lib/devices/bbox.$(O) lib/devices/rescale.$(O) #@DEVICE_OPENGL@ @@ -36,13 +36,6 @@ art_in_source = @art_in_source@ rfxswf_objects=lib/modules/swfaction.$(O) lib/modules/swfbits.$(O) lib/modules/swfbutton.$(O) lib/modules/swfcgi.$(O) lib/modules/swfdraw.$(O) lib/modules/swfdump.$(O) lib/modules/swffilter.$(O) lib/modules/swffont.$(O) lib/modules/swfobject.$(O) lib/modules/swfrender.$(O) lib/modules/swfshape.$(O) lib/modules/swfsound.$(O) lib/modules/swftext.$(O) lib/modules/swftools.$(O) ocr_objects=lib/gocr/box.$(O) lib/gocr/database.$(O) lib/gocr/detect.$(O) lib/gocr/job.$(O) lib/gocr/lines.$(O) lib/gocr/list.$(O) lib/gocr/ocr0.$(O) lib/gocr/ocr0n.$(O) lib/gocr/ocr1.$(O) lib/gocr/otsu.$(O) lib/gocr/output.$(O) lib/gocr/pgm2asc.$(O) lib/gocr/pixel.$(O) lib/gocr/progress.$(O) lib/gocr/remove.$(O) lib/gocr/unicode.$(O) -OBJECTS=$(executables) $(lame_in_source) $(h263_objects) $(as12compiler_in_source) \ - $(rfxswf_modules) $(base_objects) $(gfx_objects) $(art_objects) \ - $(rfx_objects) $(ocr_objects) - -SOURCES=$(patsubst %.$(O),%.c,$(OBJECTS)) - - libpdf_objects = lib/pdf/GFXOutputDev.$(O) lib/pdf/InfoOutputDev.$(O) lib/pdf/BitmapOutputDev.$(O) lib/pdf/FullBitmapOutputDev.$(O) lib/pdf/pdf.$(O) lib/pdf/fonts.$(O) xpdf_in_source = @xpdf_in_source@ @@ -64,17 +57,26 @@ splash_objects = lib/pdf/xpdf/SplashOutputDev.$(O) lib/pdf/xpdf/SplashFont.$(O) lib/pdf/xpdf/SplashScreen.$(O) lib/pdf/xpdf/SplashPath.$(O) lib/pdf/xpdf/SplashXPath.$(O) lib/pdf/xpdf/SplashXPathScanner.$(O) \ lib/pdf/xpdf/SplashFTFontEngine.$(O) lib/pdf/xpdf/SplashFTFontFile.$(O) lib/pdf/xpdf/SplashFTFont.$(O) +OBJECTS=$(executables) $(lame_in_source) $(h263_objects) $(as12compiler_in_source) \ + $(as3compiler_objects) $(rfxswf_modules) $(base_objects) $(gfx_objects) $(art_objects) \ + $(rfx_objects) $(ocr_objects) \ + $(libpdf_objects) $(xpdf_in_source) $(splash_in_source) + +SOURCES=$(patsubst %.$(O),%.c,$(OBJECTS)) + +depend: Makefile.deps Makefile.deps: $(SOURCES) rm -f Makefile.deps for s in $(SOURCES);do $(DEP) $$s >> Makefile.deps || >Makefile.deps;done @echo "Dependencies have been regenerated. Please re-run make." @false -%.$(O): %.c Makefile.deps +%.$(O): %.c $(C) $< -o $@ -lib/libpdf$(A): - cd lib/pdf;$(MAKE) +lib/libpdf$(A): $(libpdf_objects) $(xpdf_in_source) $(splash_in_source) + $(AR) r lib/libpdf$(A) $(libpdf_objects) $(xpdf_in_source) $(splash_in_source) + $(RANLIB) lib/libpdf$(A) # TODO: include the following rule only if lex is available src/parser.yy.c: src/parser.lex -- 1.7.10.4