dirac-shared.patch

   1 diff -urN aa/dirac-0.4.1/configure.ac dirac-0.4.1/configure.ac
   2 --- aa/dirac-0.4.1/configure.ac 2004-08-26 13:02:52.000000000 +0200
   3 +++ dirac-0.4.1/configure.ac    2004-08-26 15:38:38.714554768 +0200
   4 @@ -66,7 +66,7 @@
   5                 use_msvc=yes
   6                 ;;
   7         *)
   8 -               AC_PROG_RANLIB
   9 +               AC_PROG_LIBTOOL
  10                 ;;
  11  esac
  12  AM_CONDITIONAL(USE_MSVC, test x"$use_msvc" = "xyes")
  13 diff -urN aa/dirac-0.4.1/decoder/Makefile.am dirac-0.4.1/decoder/Makefile.am
  14 --- aa/dirac-0.4.1/decoder/Makefile.am  2004-08-25 18:58:10.000000000 +0200
  15 +++ dirac-0.4.1/decoder/Makefile.am     2004-08-26 15:38:59.028466584 +0200
  16 @@ -4,7 +4,7 @@
  17
  18  dirac_decoder_SOURCES = decmain.cpp
  19
  20 -LDADD = ../libdirac_decoder/libdirac_decoder.a ../libdirac_common/libdirac_common.a
  21 +LDADD = ../libdirac_decoder/libdirac_decoder.la ../libdirac_common/libdirac_common.la
  22
  23  if USE_MSVC
  24  CLEANFILES = *.pdb *.ilk
  25 diff -urN aa/dirac-0.4.1/encoder/Makefile.am dirac-0.4.1/encoder/Makefile.am
  26 --- aa/dirac-0.4.1/encoder/Makefile.am  2004-08-25 18:58:11.000000000 +0200
  27 +++ dirac-0.4.1/encoder/Makefile.am     2004-08-26 15:39:22.011972560 +0200
  28 @@ -4,7 +4,7 @@
  29
  30  dirac_encoder_SOURCES = encmain.cpp
  31
  32 -LDADD = ../libdirac_encoder/libdirac_encoder.a ../libdirac_common/libdirac_common.a ../libdirac_motionest/libdirac_motionest.a
  33 +LDADD = ../libdirac_encoder/libdirac_encoder.la ../libdirac_common/libdirac_common.la ../libdirac_motionest/libdirac_motionest.la
  34
  35  if USE_MSVC
  36  CLEANFILES = *.pdb *.ilk
  37 diff -urN aa/dirac-0.4.1/libdirac_common/Makefile.am dirac-0.4.1/libdirac_common/Makefile.am
  38 --- aa/dirac-0.4.1/libdirac_common/Makefile.am  2004-08-25 18:58:11.000000000 +0200
  39 +++ dirac-0.4.1/libdirac_common/Makefile.am     2004-08-26 15:40:09.227794664 +0200
  40 @@ -10,9 +10,9 @@
  41                mv_codec.cpp pic_io.cpp upconvert.cpp wavelet_utils.cpp \
  42                cmd_line.cpp dirac_assertions.cpp
  43
  44 -lib_LIBRARIES = libdirac_common.a
  45 +lib_LTLIBRARIES = libdirac_common.la
  46
  47 -libdirac_common_a_SOURCES = $(h_sources) $(cpp_sources)
  48 +libdirac_common_la_SOURCES = $(h_sources) $(cpp_sources)
  49
  50  library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/libdirac_common
  51  library_include_HEADERS = $(h_sources)
  52 diff -urN aa/dirac-0.4.1/libdirac_decoder/Makefile.am dirac-0.4.1/libdirac_decoder/Makefile.am
  53 --- aa/dirac-0.4.1/libdirac_decoder/Makefile.am 2004-08-25 18:58:12.000000000 +0200
  54 +++ dirac-0.4.1/libdirac_decoder/Makefile.am    2004-08-26 15:45:19.620607784 +0200
  55 @@ -6,9 +6,9 @@
  56  cpp_sources = comp_decompress.cpp frame_decompress.cpp seq_decompress.cpp \
  57               dirac_cppparser.cpp dirac_parser.cpp
  58
  59 -lib_LIBRARIES = libdirac_decoder.a
  60 +lib_LTLIBRARIES = libdirac_decoder.la
  61
  62 -libdirac_decoder_a_SOURCES = $(h_sources) $(cpp_sources)
  63 +libdirac_decoder_la_SOURCES = $(h_sources) $(cpp_sources)
  64
  65  library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/libdirac_decoder
  66  library_include_HEADERS = $(h_sources)
  67 diff -urN aa/dirac-0.4.1/libdirac_encoder/Makefile.am dirac-0.4.1/libdirac_encoder/Makefile.am
  68 --- aa/dirac-0.4.1/libdirac_encoder/Makefile.am 2004-08-25 18:58:12.000000000 +0200
  69 +++ dirac-0.4.1/libdirac_encoder/Makefile.am    2004-08-26 15:45:42.139184440 +0200
  70 @@ -4,9 +4,9 @@
  71
  72  cpp_sources = comp_compress.cpp frame_compress.cpp quality_monitor.cpp seq_compress.cpp
  73
  74 -lib_LIBRARIES = libdirac_encoder.a
  75 +lib_LTLIBRARIES = libdirac_encoder.la
  76
  77 -libdirac_encoder_a_SOURCES = $(h_sources) $(cpp_sources)
  78 +libdirac_encoder_la_SOURCES = $(h_sources) $(cpp_sources)
  79
  80  library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/libdirac_encoder
  81  library_include_HEADERS = $(h_sources)
  82 diff -urN aa/dirac-0.4.1/libdirac_motionest/Makefile.am dirac-0.4.1/libdirac_motionest/Makefile.am
  83 --- aa/dirac-0.4.1/libdirac_motionest/Makefile.am       2004-08-25 18:58:12.000000000 +0200
  84 +++ dirac-0.4.1/libdirac_motionest/Makefile.am  2004-08-26 15:44:00.462641624 +0200
  85 @@ -4,9 +4,9 @@
  86
  87  cpp_sources = block_match.cpp downconvert.cpp me_mode_decn.cpp me_subpel.cpp me_utils.cpp motion_estimate.cpp pixel_match.cpp
  88
  89 -lib_LIBRARIES = libdirac_motionest.a
  90 +lib_LTLIBRARIES = libdirac_motionest.la
  91
  92 -libdirac_motionest_a_SOURCES = $(h_sources) $(cpp_sources)
  93 +libdirac_motionest_la_SOURCES = $(h_sources) $(cpp_sources)
  94
  95  library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/libdirac_motionest
  96  library_include_HEADERS = $(h_sources)
  97 diff -urN aa/dirac-0.4.1/picheader/Makefile.am dirac-0.4.1/picheader/Makefile.am
  98 --- aa/dirac-0.4.1/picheader/Makefile.am        2004-08-25 18:58:12.000000000 +0200
  99 +++ dirac-0.4.1/picheader/Makefile.am   2004-08-26 15:45:58.186744840 +0200
 100 @@ -4,7 +4,7 @@
 101
 102  make_header_SOURCES = headmain.cpp
 103
 104 -LDADD = ../libdirac_common/libdirac_common.a
 105 +LDADD = ../libdirac_common/libdirac_common.la
 106
 107  if USE_MSVC
 108  CLEANFILES = *.pdb *.ilk
 109 diff -urN aa/dirac-0.4.1/unit_tests/Makefile.am dirac-0.4.1/unit_tests/Makefile.am
 110 --- aa/dirac-0.4.1/unit_tests/Makefile.am       2004-08-25 18:58:13.000000000 +0200
 111 +++ dirac-0.4.1/unit_tests/Makefile.am  2004-08-26 15:45:36.198087624 +0200
 112 @@ -8,7 +8,7 @@
 113                                                  arrays_test.h \
 114                                                  arrays_test.cpp
 115
 116 -LDADD = ../libdirac_encoder/libdirac_encoder.a ../libdirac_common/libdirac_common.a ../libdirac_motionest/libdirac_motionest.a -ldl -lcppunit
 117 +LDADD = ../libdirac_encoder/libdirac_encoder.la ../libdirac_common/libdirac_common.la ../libdirac_motionest/libdirac_motionest.la -ldl -lcppunit
 118
 119  if USE_MSVC
 120  CLEANFILES = *.pdb *.ilk
 121 diff -urN aa/dirac-0.4.1/util/conversion/common/Makefile.am dirac-0.4.1/util/conversion/common/Makefile.am
 122 --- aa/dirac-0.4.1/util/conversion/common/Makefile.am   2004-08-25 18:58:14.000000000 +0200
 123 +++ dirac-0.4.1/util/conversion/common/Makefile.am      2004-08-26 15:43:27.154705200 +0200
 124 @@ -4,9 +4,9 @@
 125
 126  cpp_sources = setstdiomode.cpp bitmap.cpp
 127
 128 -lib_LIBRARIES = libconv_common.a
 129 +lib_LTLIBRARIES = libconv_common.la
 130
 131 -libconv_common_a_SOURCES = $(h_sources) $(cpp_sources)
 132 +libconv_common_la_SOURCES = $(h_sources) $(cpp_sources)
 133
 134  library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)
 135  library_include_HEADERS = $(h_sources)
 136 diff -urN aa/dirac-0.4.1/util/conversion/Makefile.am dirac-0.4.1/util/conversion/Makefile.am
 137 --- aa/dirac-0.4.1/util/conversion/Makefile.am  2004-08-25 18:58:13.000000000 +0200
 138 +++ dirac-0.4.1/util/conversion/Makefile.am     2004-08-26 15:44:28.521376048 +0200
 139 @@ -17,7 +17,7 @@
 140  UYVYtoRGB_SOURCES=UYVYtoRGB.cpp
 141  BMPtoRGB_SOURCES=BMPtoRGB.cpp
 142
 143 -LDADD = common/libconv_common.a
 144 +LDADD = common/libconv_common.la
 145
 146  if USE_MSVC
 147  CLEANFILES = *.pdb *.ilk
 148 diff -urN aa/dirac-0.4.1/util/instrumentation/libdirac_instrument/Makefile.am dirac-0.4.1/util/instrumentation/libdirac_instrument/Makefile.am
 149 --- aa/dirac-0.4.1/util/instrumentation/libdirac_instrument/Makefile.am 2004-08-25 18:58:15.000000000 +0200
 150 +++ dirac-0.4.1/util/instrumentation/libdirac_instrument/Makefile.am    2004-08-26 15:45:03.377077176 +0200
 151 @@ -4,9 +4,9 @@
 152
 153  cpp_sources = overlay.cpp draw_overlay.cpp motion_colour.cpp motion_arrows.cpp motion_colour_arrows.cpp sad.cpp pred_mode.cpp split_mode.cpp overlay_symbols.cpp
 154
 155 -lib_LIBRARIES = libdirac_instrument.a
 156 +lib_LTLIBRARIES = libdirac_instrument.la
 157
 158 -libdirac_instrument_a_SOURCES = $(h_sources) $(cpp_sources)
 159 +libdirac_instrument_la_SOURCES = $(h_sources) $(cpp_sources)
 160
 161  library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)
 162  library_include_HEADERS = $(h_sources)
 163 diff -urN aa/dirac-0.4.1/util/instrumentation/Makefile.am dirac-0.4.1/util/instrumentation/Makefile.am
 164 --- aa/dirac-0.4.1/util/instrumentation/Makefile.am     2004-08-25 18:58:14.000000000 +0200
 165 +++ dirac-0.4.1/util/instrumentation/Makefile.am        2004-08-26 15:44:51.066948600 +0200
 166 @@ -8,7 +8,7 @@
 167
 168  dirac_instrumentation_SOURCES = $(h_sources) $(cpp_sources)
 169
 170 -LDADD = ../../libdirac_encoder/libdirac_encoder.a ../../libdirac_common/libdirac_common.a ../../libdirac_motionest/libdirac_motionest.a libdirac_instrument/libdirac_instrument.a
 171 +LDADD = ../../libdirac_encoder/libdirac_encoder.la ../../libdirac_common/libdirac_common.la ../../libdirac_motionest/libdirac_motionest.la libdirac_instrument/libdirac_instrument.la
 172
 173  if USE_MSVC
 174  CLEANFILES = *.pdb *.ilk