-jpeg2swf_LINK = $(CCLD) ../lib/rfxswf.o -o $@
-swfdump_LINK = $(CCLD) ../lib/rfxswf.o -o $@
-swfcombine_LINK = $(CCLD) ../lib/log.o -o $@
-swfstrings_LINK = $(CCLD) ../lib/log.o ../lib/rfxswf.o -o $@
-man_MANS = swfcombine.1 swfstrings.1 swfdump.1 jpeg2swf.1
+jpeg2swf_SOURCES = jpeg2swf.c
+png2swf_LINK = $(CCLD) ../lib/librfxswf.a -o $@
+wav2swf_LINK = $(CCLD) ../lib/librfxswf.a -o $@
+swfextract_LINK = $(CCLD) -o $@
+swfdump_LINK = $(CCLD) ../lib/librfxswf.a -o $@
+swfcombine_LINK = $(CCLD) ../lib/librfxswf.a -o $@
+swfstrings_LINK = $(CCLD) ../lib/librfxswf.a -o $@
+jpeg2swf_LINK = $(CCLD) -o $@
+wav2swf_LDADD = ../lib/librfxswf.a
+png2swf_LDADD = ../lib/librfxswf.a
+swfstrings_LDADD = ../lib/librfxswf.a
+swfcombine_LDADD = ../lib/librfxswf.a
+swfdump_LDADD = ../lib/librfxswf.a
+swfextract_LDADD = ../lib/librfxswf.a
+jpeg2swf_LDADD = ../lib/librfxswf.a
+man_MANS = png2swf.1 wav2swf.1 swfcombine.1 swfstrings.1 swfextract.1 swfdump.1 jpeg2swf.1