X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2FMakefile.in;h=8fe12910fe07da44c9b47380bbb44e8d853f00b2;hb=9f826653fb88e865129c686ccf09d2c700494068;hp=607eb6d52273084459175a9ab8f59fc7c4b7e13b;hpb=10e246c23a8ba1d3183d5390427cab4fb0a11fb8;p=swftools.git

diff --git a/src/Makefile.in b/src/Makefile.in
index 607eb6d..8fe1291 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -31,10 +31,18 @@ swf2png.$(O): swf2png.c
 	$(C) swf2png.c -o $@
 jpeg2swf.$(O): jpeg2swf.c
 	$(C) jpeg2swf.c -o $@
+swfrender.$(O): swfrender.c
+	$(C) swfrender.c -o $@
 font2swf.$(O): font2swf.c
 	$(C) font2swf.c -o $@
 swfc.$(O): swfc.c parser.h ../lib/q.h
 	$(C) swfc.c -o $@
+swfc-feedback.$(O): swfc-feedback.c swfc-feedback.h
+	$(C) swfc-feedback.c -o $@
+swfc-history.$(O): swfc-history.c swfc-history.h swfc-interpolation.h
+	$(C) swfc-history.c -o $@
+swfc-interpolation.$(O): swfc-interpolation.c swfc-interpolation.h
+	$(C) swfc-interpolation.c -o $@
 parser.$(O): parser.yy.c parser.h ../lib/q.h
 	$(C) parser.yy.c -o $@
 
@@ -43,49 +51,54 @@ parser.$(O): parser.yy.c parser.h ../lib/q.h
 
 # TODO: include the following rule only if lex is available
 parser.yy.c: parser.lex
-	flex -Bs -oparser.yy.c parser.lex
+	flex -B -s -oparser.yy.c parser.lex
 
-wav2swf$(E): wav2swf.$(O) ../lib/wav.$(O) ../lib/librfxswf$(A)
-	$(L) wav2swf.$(O) ../lib/wav.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
+wav2swf$(E): wav2swf.$(O) ../lib/librfxswf$(A) ../lib/libbase$(A)
+	$(L) wav2swf.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libbase$(A) $(LIBS)
 	$(STRIP) $@
-png2swf$(E): png2swf.$(O) ../lib/librfxswf$(A)
-	$(L) png2swf.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
+png2swf$(E): png2swf.$(O) ../lib/librfxswf$(A) ../lib/libbase$(A)
+	$(L) png2swf.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libbase$(A) $(LIBS)
 	$(STRIP) $@
-gif2swf$(E): gif2swf.$(O) ../lib/librfxswf$(A)
-	$(L) gif2swf.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
+gif2swf$(E): gif2swf.$(O) ../lib/librfxswf$(A) ../lib/libbase$(A)
+	$(L) gif2swf.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libbase$(A) $(LIBS)
 	$(STRIP) $@
-swfcombine$(E): swfcombine.$(O) ../lib/librfxswf$(A)
-	$(L) swfcombine.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
+swfcombine$(E): swfcombine.$(O) ../lib/librfxswf$(A) ../lib/libbase$(A)
+	$(L) swfcombine.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libbase$(A) $(LIBS)
 	$(STRIP) $@
-swfdump$(E): swfdump.$(O) ../lib/librfxswf$(A)
-	$(L) swfdump.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
+swfdump$(E): swfdump.$(O) ../lib/librfxswf$(A) ../lib/libbase$(A)
+	$(L) swfdump.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libbase$(A) $(LIBS)
 	$(STRIP) $@
-swfedit$(E): swfedit.$(O) ../lib/librfxswf$(A)
-	$(L) swfedit.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
+swfedit$(E): swfedit.$(O) ../lib/librfxswf$(A) ../lib/libbase$(A)
+	$(L) swfedit.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libbase$(A) $(LIBS)
 	$(STRIP) $@
-swf2png$(E): swf2png.$(O) ../lib/librfxswf$(A) ../lib/png.$(O)
-	$(L) swf2png.$(O) -o $@ ../lib/librfxswf$(A) ../lib/png.$(O) $(LIBS)
+swf2png$(E): swf2png.$(O) ../lib/librfxswf$(A) ../lib/libbase$(A)
+	$(L) swf2png.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libbase$(A) $(LIBS)
 	$(STRIP) $@
-swfextract$(E): swfextract.$(O) ../lib/librfxswf$(A)
-	$(L) swfextract.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
+swfextract$(E): swfextract.$(O) ../lib/librfxswf$(A) ../lib/libbase$(A)
+	$(L) swfextract.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libbase$(A) $(LIBS)
 	$(STRIP) $@
-swfstrings$(E): swfstrings.$(O) ../lib/librfxswf$(A)
-	$(L) swfstrings.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
+swfstrings$(E): swfstrings.$(O) ../lib/librfxswf$(A) ../lib/libbase$(A)
+	$(L) swfstrings.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libbase$(A) $(LIBS)
 	$(STRIP) $@
-swfbbox$(E): swfbbox.$(O) ../lib/librfxswf$(A)
-	$(L) swfbbox.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
+swfbbox$(E): swfbbox.$(O) ../lib/librfxswf$(A) ../lib/libbase$(A)
+	$(L) swfbbox.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libbase$(A) $(LIBS)
 	$(STRIP) $@
-font2swf$(E): font2swf.$(O) ../lib/librfxswf$(A)
-	$(L) font2swf.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
+font2swf$(E): font2swf.$(O) ../lib/librfxswf$(A) ../lib/libbase$(A)
+	$(L) font2swf.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libbase$(A) $(LIBS)
 	$(STRIP) $@
-jpeg2swf$(E): jpeg2swf.$(O) ../lib/librfxswf$(A)
-	$(L) jpeg2swf.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
+jpeg2swf$(E): jpeg2swf.$(O) ../lib/librfxswf$(A) ../lib/libbase$(A)
+	$(L) jpeg2swf.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libbase$(A) $(LIBS)
 	$(STRIP) $@
-pdf2swf$(E): pdf2swf.$(O) ../lib/librfxswf$(A) ../lib/libpdf$(A)
-	$(L) pdf2swf.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libpdf$(A) ../lib/gfxtools.$(O) ../lib/gfxfont.$(O) ../lib/os.$(O) ../lib/devices/swf.$(O) ../lib/art/libart$(A) $(LIBS) $(CXXLIBS)
+swfrender$(E): swfrender.$(O) ../lib/librfxswf$(A) ../lib/libgfx$(A) ../lib/swf/swf.$(O) ../lib/libbase$(A) 
+	$(L) swfrender.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libgfx$(A) ../lib/swf/swf.$(O) ../lib/libbase$(A) $(LIBS) 
 	$(STRIP) $@
-swfc$(E): parser.$(O) swfc.$(O) ../lib/q.$(O) ../lib/mp3.$(O) ../lib/wav.$(O) ../lib/png.$(O) ../lib/librfxswf$(A)
-	$(L) parser.$(O) swfc.$(O) ../lib/q.$(O) ../lib/mp3.$(O) ../lib/wav.$(O) ../lib/png.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
+
+PDF2SWF_OBJ=../lib/librfxswf$(A) ../lib/libpdf$(A) ../lib/devices/arts.$(O) ../lib/devices/swf.$(O) ../lib/art/libart$(A) ../lib/libgfx$(A) ../lib/libbase$(A)
+pdf2swf$(E): pdf2swf.$(O) $(PDF2SWF_OBJ)
+	$(LL) pdf2swf.$(O) -o $@ $(PDF2SWF_OBJ) $(LIBS) $(CXXLIBS)
+	$(STRIP) $@
+swfc$(E): parser.$(O) swfc.$(O) swfc-feedback.$(O) swfc-history.$(O) swfc-interpolation.$(O) ../lib/librfxswf$(A) ../lib/libbase$(A) 
+	$(L) parser.$(O) swfc.$(O) swfc-feedback.$(O) swfc-history.$(O) swfc-interpolation.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libbase$(A) $(LIBS)
 	$(STRIP) $@
 
 install:
@@ -112,7 +125,6 @@ doc:
 	perl ../parsedoc.pl swfcombine.doc
 	perl ../parsedoc.pl swfdump.doc
 	perl ../parsedoc.pl swfc.doc
-	perl ../parsedoc.pl pdf2swf.doc
 	#perl ../parsedoc.pl swfedit.doc
 
 .PHONY: clean doc