moved wav.{c,h} to ../lib.

[swftools.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 9e64ee8..8b9714d 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -7,10 +7,8 @@ programs = wav2swf$(E) @PNG2SWF@ swfcombine$(E) swfstrings$(E) swfextract$(E) sw
 
 all: $(programs)
 
-wav2swf.$(O): wav2swf.c wav.h
+wav2swf.$(O): wav2swf.c ../lib/wav.h
        $(C) wav2swf.c -o $@
-wav.$(O): wav.c wav.h
-       $(C) wav.c -o $@
 png2swf.$(O): png2swf.c
        $(C) png2swf.c -o $@
 gif2swf.$(O): gif2swf.c
@@ -25,8 +23,10 @@ swfstrings.$(O): swfstrings.c
        $(C) swfstrings.c -o $@
 swfbbox.$(O): swfbbox.c
        $(C) swfbbox.c -o $@
-#swfedit.$(O): swfedit.c
-#      $(C) swfedit.c -o $@
+swfedit.$(O): swfedit.c
+       $(C) swfedit.c -o $@
+swf2png.$(O): swf2png.c
+       $(C) swf2png.c -o $@
 jpeg2swf.$(O): jpeg2swf.c
        $(C) jpeg2swf.c -o $@
 font2swf.$(O): font2swf.c
@@ -36,12 +36,15 @@ swfc.$(O): swfc.c parser.h ../lib/q.h
 parser.$(O): parser.yy.c parser.h ../lib/q.h
        $(C) parser.yy.c -o $@
 
+../lib/librfxswf$(A): ../lib/modules/swfrender.c ../lib/modules/swfshape.c ../lib/modules/swfbits.c ../lib/rfxswf.c
+       cd ../lib;$(MAKE) librfxswf$(A);cd -
+
 # TODO: include the following rule only if lex is available
 parser.yy.c: parser.lex
        flex -Bs -oparser.yy.c parser.lex
 
-wav2swf$(E): wav2swf.$(O) wav.$(O) ../lib/librfxswf$(A)
-       $(L) wav2swf.$(O) wav.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
+wav2swf$(E): wav2swf.$(O) ../lib/wav.$(O) ../lib/librfxswf$(A)
+       $(L) wav2swf.$(O) ../lib/wav.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
        $(STRIP) $@
 png2swf$(E): png2swf.$(O) ../lib/librfxswf$(A)
        $(L) png2swf.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
@@ -55,9 +58,12 @@ swfcombine$(E): swfcombine.$(O) ../lib/librfxswf$(A)
 swfdump$(E): swfdump.$(O) ../lib/librfxswf$(A)
        $(L) swfdump.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
        $(STRIP) $@
-#swfedit$(E): swfedit.$(O) ../lib/librfxswf$(A)
-#      $(L) swfedit.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
-#      $(STRIP) $@
+swfedit$(E): swfedit.$(O) ../lib/librfxswf$(A)
+       $(L) swfedit.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
+       $(STRIP) $@
+swf2png$(E): swf2png.$(O) ../lib/librfxswf$(A) ../lib/png.$(O)
+       $(L) swf2png.$(O) -o $@ ../lib/librfxswf$(A) ../lib/png.$(O) $(LIBS)
+       $(STRIP) $@
 swfextract$(E): swfextract.$(O) ../lib/librfxswf$(A)
        $(L) swfextract.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
        $(STRIP) $@
@@ -73,8 +79,8 @@ font2swf$(E): font2swf.$(O) ../lib/librfxswf$(A)
 jpeg2swf$(E): jpeg2swf.$(O) ../lib/librfxswf$(A)
        $(L) jpeg2swf.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
        $(STRIP) $@
-swfc$(E): parser.$(O) swfc.$(O) ../lib/q.$(O) wav.$(O) ../lib/png.$(O) ../lib/librfxswf$(A)
-       $(L) parser.$(O) swfc.$(O) ../lib/q.$(O) wav.$(O) ../lib/png.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS)
+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)
        $(STRIP) $@
 
 install: