X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2FMakefile.in;h=9880923812dd12e0b6d17bd8a149b827ec96dad5;hb=700149a0c2f48de3c5bad82a3a1ceda106056e48;hp=abda4d951f134b00db2e568a50c3a971dd99a753;hpb=1bd652ce4188759612049505b0553a6e5c946f19;p=swftools.git

diff --git a/src/Makefile.in b/src/Makefile.in
index abda4d9..9880923 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -40,11 +40,6 @@ pkgincludedir = $(includedir)/@PACKAGE@
 
 top_builddir = ..
 
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
@@ -69,21 +64,21 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 
-bin_PROGRAMS = swfcombine swfstrings swfdump jpeg2swf
 jpeg2swf_SOURCES = jpeg2swf.c
 swfdump_SOURCES = swfdump.c
+swfextract_SOURCES = swfextract.c
 swfcombine_SOURCES = bitio.c bitio.h reloc.c reloc.h combine.c combine.h flash.c flash.h swfcombine.c types.h
 swfstrings_SOURCES = swfstrings.c
-jpeg2swf_LINK = $(CCLD) ../lib/rfxswf.o -o $@
-swfdump_LINK = $(CCLD) ../lib/rfxswf.o -o $@
+jpeg2swf_LINK = $(CCLD) -o $@
+swfdump_LINK = $(CCLD) -o $@
+swfextract_LINK = $(CCLD) -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
+swfstrings_LINK = $(CCLD) -o $@
+man_MANS = swfcombine.1 swfstrings.1 swfextract.1 swfdump.1 jpeg2swf.1
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
-bin_PROGRAMS =  swfcombine$(EXEEXT) swfstrings$(EXEEXT) swfdump$(EXEEXT) \
-jpeg2swf$(EXEEXT)
+bin_PROGRAMS =  swfcombine$(EXEEXT) swfstrings$(EXEEXT) swfextract$(EXEEXT) swfdump$(EXEEXT) @JPEG2SWF@
 PROGRAMS =  $(bin_PROGRAMS)
 
 
@@ -96,15 +91,19 @@ swfcombine_LDADD = $(LDADD)
 swfcombine_DEPENDENCIES = 
 swfcombine_LDFLAGS = 
 swfstrings_OBJECTS =  swfstrings.o
-swfstrings_LDADD = $(LDADD)
+swfstrings_LDADD = $(LDADD) ../lib/librfxswf.a
 swfstrings_DEPENDENCIES = 
 swfstrings_LDFLAGS = 
 swfdump_OBJECTS =  swfdump.o
-swfdump_LDADD = $(LDADD)
+swfdump_LDADD = $(LDADD) ../lib/librfxswf.a
 swfdump_DEPENDENCIES = 
 swfdump_LDFLAGS = 
+swfextract_OBJECTS =  swfextract.o reloc.o bitio.o flash.o
+swfextract_LDADD = $(LDADD) ../lib/librfxswf.a
+swfextract_DEPENDENCIES = 
+swfextract_LDFLAGS = 
 jpeg2swf_OBJECTS =  jpeg2swf.o
-jpeg2swf_LDADD = $(LDADD)
+jpeg2swf_LDADD = $(LDADD) ../lib/librfxswf.a
 jpeg2swf_DEPENDENCIES = 
 jpeg2swf_LDFLAGS = 
 CFLAGS = @CFLAGS@
@@ -115,7 +114,7 @@ man1dir = $(mandir)/man1
 MANS = $(man_MANS)
 
 NROFF = nroff
-DIST_COMMON =  Makefile.am Makefile.in
+DIST_COMMON =  Makefile.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -123,10 +122,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 TAR = tar
 GZIP_ENV = --best
 DEP_FILES =  .deps/bitio.P .deps/combine.P .deps/flash.P \
-.deps/jpeg2swf.P .deps/reloc.P .deps/swfcombine.P .deps/swfdump.P \
+.deps/jpeg2swf.P .deps/reloc.P .deps/swfcombine.P .deps/swfextract.P .deps/swfdump.P \
 .deps/swfstrings.P
-SOURCES = $(swfcombine_SOURCES) $(swfstrings_SOURCES) $(swfdump_SOURCES) $(jpeg2swf_SOURCES)
-OBJECTS = $(swfcombine_OBJECTS) $(swfstrings_OBJECTS) $(swfdump_OBJECTS) $(jpeg2swf_OBJECTS)
+SOURCES = $(swfcombine_SOURCES) $(swfstrings_SOURCES) $(swfextract_SOURCES) $(swfdump_SOURCES) $(jpeg2swf_SOURCES)
+OBJECTS = $(swfcombine_OBJECTS) $(swfstrings_OBJECTS) $(swfextract_SOURCES) $(swfdump_OBJECTS) $(jpeg2swf_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -177,15 +176,19 @@ swfcombine$(EXEEXT): $(swfcombine_OBJECTS) $(swfcombine_DEPENDENCIES)
 	@rm -f swfcombine$(EXEEXT)
 	$(swfcombine_LINK) $(swfcombine_LDFLAGS) $(swfcombine_OBJECTS) $(swfcombine_LDADD) $(LIBS)
 
-swfstrings$(EXEEXT): $(swfstrings_OBJECTS) $(swfstrings_DEPENDENCIES)
+swfstrings$(EXEEXT): $(swfstrings_OBJECTS) $(swfstrings_DEPENDENCIES) ../lib/librfxswf.a
 	@rm -f swfstrings$(EXEEXT)
 	$(swfstrings_LINK) $(swfstrings_LDFLAGS) $(swfstrings_OBJECTS) $(swfstrings_LDADD) $(LIBS)
 
-swfdump$(EXEEXT): $(swfdump_OBJECTS) $(swfdump_DEPENDENCIES)
+swfdump$(EXEEXT): $(swfdump_OBJECTS) $(swfdump_DEPENDENCIES) ../lib/librfxswf.a
 	@rm -f swfdump$(EXEEXT)
 	$(swfdump_LINK) $(swfdump_LDFLAGS) $(swfdump_OBJECTS) $(swfdump_LDADD) $(LIBS)
 
-jpeg2swf$(EXEEXT): $(jpeg2swf_OBJECTS) $(jpeg2swf_DEPENDENCIES)
+swfextract$(EXEEXT): $(swfextract_OBJECTS) $(swfextract_DEPENDENCIES) ../lib/librfxswf.a
+	@rm -f swfextract$(EXEEXT)
+	$(swfextract_LINK) $(swfextract_LDFLAGS) $(swfextract_OBJECTS) $(swfextract_LDADD) $(LIBS)
+
+jpeg2swf$(EXEEXT): $(jpeg2swf_OBJECTS) $(jpeg2swf_DEPENDENCIES) ../lib/librfxswf.a
 	@rm -f jpeg2swf$(EXEEXT)
 	$(jpeg2swf_LINK) $(jpeg2swf_LDFLAGS) $(jpeg2swf_OBJECTS) $(jpeg2swf_LDADD) $(LIBS)
 
@@ -265,8 +268,6 @@ distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
 	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -328,7 +329,7 @@ install-am: all-am
 install: install-am
 uninstall-am: uninstall-binPROGRAMS uninstall-man
 uninstall: uninstall-am
-all-am: $(PROGRAMS) $(MANS)
+all-am: Makefile $(PROGRAMS) $(MANS)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -342,7 +343,7 @@ clean-generic:
 
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f config.cache config.log
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \