X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2FMakefile.in;h=0e85d1841d0abd17f21613f746fafd0d3e378cc9;hb=4d5e2bc031fd25ce7c76fb0ba2b7da7c01d91eac;hp=a0411e7a1a7ddaa25ae7364746c024b38fee4a72;hpb=22c1a75684bca4ff7ede1cc85a32c347c3dea508;p=swftools.git

diff --git a/src/Makefile.in b/src/Makefile.in
index a0411e7..0e85d18 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -72,21 +72,22 @@ WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
 bin_PROGRAMS = wav2swf png2swf swfcombine swfstrings swfextract swfdump @JPEG2SWF@
 wav2swf_SOURCES = wav2swf.c wav.c wav.h
 png2swf_SOURCES = png2swf.c
-swfextract_SOURCES = swfextract.c reloc.c bitio.c flash.c
+swfextract_SOURCES = swfextract.c
 swfdump_SOURCES = swfdump.c
-swfcombine_SOURCES = bitio.c bitio.h reloc.c reloc.h combine.c combine.h flash.c flash.h swfcombine.c types.h
+swfcombine_SOURCES = swfcombine.c
 swfstrings_SOURCES = swfstrings.c
 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/log.o -o $@
-swfstrings_LINK = $(CCLD) ../lib/librfxswf.a -o $@
-jpeg2swf_LINK = $(CCLD) -o $@
+png2swf_LINK = $(LINK) ../lib/librfxswf.a -o $@
+wav2swf_LINK = $(LINK) ../lib/librfxswf.a -o $@
+swfextract_LINK = $(LINK) -o $@
+swfdump_LINK = $(LINK) ../lib/librfxswf.a -o $@
+swfcombine_LINK = $(LINK) ../lib/librfxswf.a -o $@
+swfstrings_LINK = $(LINK) ../lib/librfxswf.a -o $@
+jpeg2swf_LINK = $(LINK) -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
@@ -110,14 +111,13 @@ wav2swf_LDFLAGS =
 png2swf_OBJECTS =  png2swf.o
 png2swf_DEPENDENCIES =  ../lib/librfxswf.a
 png2swf_LDFLAGS = 
-swfcombine_OBJECTS =  bitio.o reloc.o combine.o flash.o swfcombine.o
-swfcombine_LDADD = $(LDADD)
-swfcombine_DEPENDENCIES = 
+swfcombine_OBJECTS =  swfcombine.o
+swfcombine_DEPENDENCIES =  ../lib/librfxswf.a
 swfcombine_LDFLAGS = 
 swfstrings_OBJECTS =  swfstrings.o
 swfstrings_DEPENDENCIES =  ../lib/librfxswf.a
 swfstrings_LDFLAGS = 
-swfextract_OBJECTS =  swfextract.o reloc.o bitio.o flash.o
+swfextract_OBJECTS =  swfextract.o
 swfextract_DEPENDENCIES =  ../lib/librfxswf.a
 swfextract_LDFLAGS = 
 swfdump_OBJECTS =  swfdump.o