swftools-shared.patch

   1 --- swftools-0.4.3/src/Makefile.in.orig 2003-01-07 09:33:02.000000000 +0100
   2 +++ swftools-0.4.3/src/Makefile.in      2004-03-27 10:48:40.241613936 +0100
   3 @@ -25,19 +25,21 @@
   4         $(C) jpeg2swf.c -o $@
   5
   6  wav2swf: wav2swf.o wav.o
   7 -       $(L) wav2swf.o wav.o -o $@ ../lib/librfxswf.a $(LIBS)
   8 +       $(SL) wav2swf.o wav.o -o $@ ../lib/librfxswf.la $(LIBS)
   9  png2swf: png2swf.o
  10 -       $(L) png2swf.o -o $@ ../lib/librfxswf.a $(LIBS)
  11 +       $(SL) png2swf.o -o $@ ../lib/librfxswf.la $(LIBS)
  12  swfcombine: swfcombine.o
  13 -       $(L) swfcombine.o -o $@ ../lib/librfxswf.a $(LIBS)
  14 +       $(SL) swfcombine.o -o $@ ../lib/librfxswf.la $(LIBS)
  15  swfdump: swfdump.o
  16 -       $(L) swfdump.o -o $@ ../lib/librfxswf.a $(LIBS)
  17 +       $(SL) swfdump.o -o $@ ../lib/librfxswf.la $(LIBS)
  18  swfextract: swfextract.o
  19 -       $(L) swfextract.o -o $@ ../lib/librfxswf.a $(LIBS)
  20 +       $(SL) swfextract.o -o $@ ../lib/librfxswf.la $(LIBS)
  21  swfstrings: swfstrings.o
  22 -       $(L) swfstrings.o -o $@ ../lib/librfxswf.a $(LIBS)
  23 +       $(SL) swfstrings.o -o $@ ../lib/librfxswf.la $(LIBS)
  24  jpeg2swf: jpeg2swf.o
  25 -       $(L) jpeg2swf.o -o $@ ../lib/librfxswf.a $(LIBS)
  26 +       $(SL) jpeg2swf.o -o $@ ../lib/librfxswf.la $(LIBS)
  27 +
  28 +INSTALL_PROGRAM=$(LIBTOOL) --mode=install install -c
  29
  30  install:
  31         $(mkinstalldirs) $(bindir)
  32 --- swftools-0.4.3/avi2swf/Makefile.in.orig     2003-01-08 18:55:51.000000000 +0100
  33 +++ swftools-0.4.3/avi2swf/Makefile.in  2004-03-27 10:48:16.739186848 +0100
  34 @@ -9,7 +9,9 @@
  35         $(CC) `avifile-config --cflags` $< -o $@
  36
  37  avi2swf: avi2swf.o
  38 -       $(LL) avi2swf.o -o avi2swf ../lib/librfxswf.a $(LIBS) `avifile-config --libs`
  39 +       $(SLL) avi2swf.o -o avi2swf ../lib/librfxswf.la $(LIBS) `avifile-config --libs`
  40 +
  41 +INSTALL_PROGRAM=$(LIBTOOL) --mode=install install -c
  42
  43  install:
  44         $(mkinstalldirs) $(bindir)
  45 --- swftools-0.4.3/pdf2swf/Makefile.in.orig     2003-01-07 09:36:59.000000000 +0100
  46 +++ swftools-0.4.3/pdf2swf/Makefile.in  2004-03-27 10:48:31.247981176 +0100
  47 @@ -19,7 +19,7 @@
  48         $(CC) -DDATADIR=\"$(pkgdatadir)\" -I../lib -Ittf2pt1 -Ixpdf swfoutput.cc -o $@
  49
  50  pdf2swf: pdf2swf.o SWFOutputDev.o swfoutput.o encodings.o spline.o xpdf/pdflib.a ttf2pt1/ttf2pt1.a
  51 -       $(LL) pdf2swf.o SWFOutputDev.o swfoutput.o encodings.o spline.o -o pdf2swf ../lib/librfxswf.a ttf2pt1/ttf2pt1.a xpdf/libpdf.a $(LIBS)
  52 +       $(SLL) pdf2swf.o SWFOutputDev.o swfoutput.o encodings.o spline.o -o pdf2swf ../lib/librfxswf.la ttf2pt1/ttf2pt1.a xpdf/libpdf.a $(LIBS)
  53
  54  xpdf/pdflib.a:
  55         cd xpdf;$(MAKE);cd ..
  56 @@ -27,6 +27,8 @@
  57  ttf2pt1/ttf2pt1.a:
  58         cd ttf2pt1;$(MAKE);cd ..
  59
  60 +INSTALL_PROGRAM=$(LIBTOOL) --mode=install install -c
  61 +
  62  install:
  63         $(mkinstalldirs) $(bindir)
  64         $(mkinstalldirs) $(man1dir)
  65 --- swftools-0.4.3/lib/Makefile.in.orig 2003-01-07 18:20:33.000000000 +0100
  66 +++ swftools-0.4.3/lib/Makefile.in      2004-03-27 10:46:37.341297624 +0100
  67 @@ -3,26 +3,25 @@
  68  top_srcdir = @top_srcdir@
  69  include ../Makefile.common
  70
  71 -all: librfxswf.a
  72 +all: librfxswf.la
  73
  74 -lame_objects =  lame/psymodel.o lame/fft.o lame/newmdct.o lame/quantize.o lame/takehiro.o lame/reservoir.o lame/quantize_pvt.o lame/vbrquantize.o lame/encoder.o lame/id3tag.o lame/version.o lame/tables.o lame/util.o lame/bitstream.o lame/set_get.o lame/VbrTag.o lame/lame.o
  75 +lame_objects =  -lmp3lame
  76  rfxswf_modules =  modules/swfbits.c modules/swfaction.c modules/swfdump.c modules/swfcgi.c modules/swfbutton.c modules/swftext.c modules/swftools.c modules/swfsound.c modules/swfshape.c modules/swfobject.c
  77
  78 -bitio.o: bitio.c bitio.h
  79 -       $(C) bitio.c -o $@
  80 -log.o: log.c log.h
  81 -       $(C) log.c -o $@
  82 -rfxswf.o: rfxswf.c rfxswf.h bitio.h log.h $(rfxswf_modules)
  83 -       $(C) rfxswf.c -o $@
  84 -
  85 -$(lame_objects):
  86 -       cd lame;make all;cd ..
  87 -
  88 -librfxswf.a: rfxswf.o bitio.o log.o $(lame_objects)
  89 -       $(AR) r librfxswf.a rfxswf.o bitio.o log.o $(lame_objects)
  90 -       $(RANLIB) librfxswf.a
  91 +bitio.lo: bitio.c bitio.h
  92 +       $(SC) bitio.c -o $@
  93 +log.lo: log.c log.h
  94 +       $(SC) log.c -o $@
  95 +rfxswf.lo: rfxswf.c rfxswf.h bitio.h log.h $(rfxswf_modules)
  96 +       $(SC) rfxswf.c -o $@
  97 +
  98 +librfxswf.la: rfxswf.lo bitio.lo log.lo
  99 +       $(SL) -o librfxswf.la rfxswf.lo bitio.lo log.lo $(lame_objects) -ljpeg -lz
 100
 101  install:
 102 +       install -d $(DESTDIR)$(libdir)
 103 +       $(LIBTOOL) --mode=install install librfxswf.la $(DESTDIR)$(libdir)
 104 +
 105  uninstall:
 106
 107  clean:
 108 --- swftools-0.4.3/swfs/Makefile.in.orig        2003-01-07 09:31:58.000000000 +0100
 109 +++ swftools-0.4.3/swfs/Makefile.in     2004-03-27 10:48:00.249693632 +0100
 110 @@ -15,11 +15,11 @@
 111         $(C) -I../lib PreLoaderTemplate.c -o $@
 112
 113  simple_viewer: simple_viewer.o
 114 -       $(L) simple_viewer.o -o $@ ../lib/librfxswf.a $(LIBS)
 115 +       $(SL) simple_viewer.o -o $@ ../lib/librfxswf.la $(LIBS)
 116  keyboard_viewer: keyboard_viewer.o
 117 -       $(L) keyboard_viewer.o -o $@ ../lib/librfxswf.a $(LIBS)
 118 +       $(SL) keyboard_viewer.o -o $@ ../lib/librfxswf.la $(LIBS)
 119  PreLoaderTemplate: PreLoaderTemplate.o
 120 -       $(L) PreLoaderTemplate.o -o $@ ../lib/librfxswf.a $(LIBS)
 121 +       $(SL) PreLoaderTemplate.o -o $@ ../lib/librfxswf.la $(LIBS)
 122
 123  simple_viewer.swf: $(programs)
 124         @echo Calling ./keybard_viewer to create keyboard_viewer.swf