dirac-am.patch

   1 --- dirac-0.5.0/libdirac_motionest/Makefile.am.orig     2004-11-22 14:54:47.000000000 +0100
   2 +++ dirac-0.5.0/libdirac_motionest/Makefile.am  2004-12-03 23:07:48.958203264 +0100
   3 @@ -7,15 +7,7 @@
   4
   5  cpp_sources = block_match.cpp downconvert.cpp me_mode_decn.cpp me_subpel.cpp me_utils.cpp motion_estimate.cpp pixel_match.cpp
   6
   7 -if USE_MSVC
   8 -noinst_LIBRARIES = libdirac_motionest.a
   9 -libdirac_motionest_a_AR = link.exe -lib /out:libdirac_motionest.a $(libdirac_motionest_a_OBJECTS) ; echo
  10 -else
  11 -libdirac_motionest_a_AR = ar crv
  12  noinst_LTLIBRARIES = libdirac_motionest.la
  13 -endif
  14 -
  15 -libdirac_motionest_a_SOURCES = $(h_sources) $(cpp_sources)
  16
  17  libdirac_motionest_la_SOURCES = $(h_sources) $(cpp_sources)
  18
  19 --- dirac-0.5.1/util/instrumentation/libdirac_instrument/Makefile.am.orig       2004-12-10 16:28:44.000000000 +0100
  20 +++ dirac-0.5.1/util/instrumentation/libdirac_instrument/Makefile.am    2005-03-03 13:03:26.297926120 +0100
  21 @@ -7,15 +7,7 @@
  22
  23  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 gm_inliers.cpp
  24
  25 -if USE_MSVC
  26 -noinst_LIBRARIES = libdirac_instrument.a
  27 -libdirac_instrument_a_AR = link.exe -lib /out:libdirac_instrument.a $(libdirac_instrument_a_OBJECTS) ; echo
  28 -else
  29  noinst_LTLIBRARIES = libdirac_instrument.la
  30 -libdirac_instrument_a_AR = ar crv
  31 -endif
  32 -
  33 -libdirac_instrument_a_SOURCES = $(h_sources) $(cpp_sources)
  34
  35  libdirac_instrument_la_SOURCES = $(h_sources) $(cpp_sources)
  36  libdirac_instrument_la_CXXFLAGS = $(AM_CXXFLAGS)
  37 --- dirac-0.6.0/libdirac_decoder/Makefile.am.orig       2006-04-20 12:41:57.000000000 +0200
  38 +++ dirac-0.6.0/libdirac_decoder/Makefile.am    2006-06-23 14:38:38.604440000 +0200
  39 @@ -9,17 +9,7 @@
  40  cpp_sources = comp_decompress.cpp frame_decompress.cpp seq_decompress.cpp \
  41               dirac_cppparser.cpp dirac_parser.cpp
  42
  43 -if USE_MSVC
  44 -lib_LIBRARIES = libdirac_decoder.a
  45 -libdirac_decoder_a_AR = link -lib -out:libdirac_decoder.a $(libdirac_decoder_a_OBJECTS); link $(LIBFLAGS) -out:libdirac_decoder$(LIBEXT) $(LDFLAGS) $(libdirac_decoder_a_OBJECTS) $(libdirac_decoder_a_DEPENDENCIES); echo
  46 -else
  47  lib_LTLIBRARIES = libdirac_decoder.la
  48 -endif
  49 -libdirac_decoder_a_SOURCES = $(h_sources) $(cpp_sources)
  50 -
  51 -libdirac_decoder_a_LIBADD = \
  52 -               $(top_builddir)/libdirac_common/libdirac_common.a \
  53 -               $(top_builddir)/libdirac_byteio/libdirac_byteio.a
  54
  55  libdirac_decoder_la_SOURCES = $(h_sources) $(cpp_sources)
  56  libdirac_decoder_la_CXXFLAGS = $(AM_CXXFLAGS)
  57 --- dirac-0.6.0/libdirac_encoder/Makefile.am.orig       2006-04-20 12:41:57.000000000 +0200
  58 +++ dirac-0.6.0/libdirac_encoder/Makefile.am    2006-06-23 14:38:59.504440000 +0200
  59 @@ -10,20 +10,7 @@
  60                quant_chooser.cpp seq_compress.cpp dirac_encoder.cpp
  61
  62
  63 -if USE_MSVC
  64 -lib_LIBRARIES = libdirac_encoder.a
  65 -libdirac_encoder_a_AR = link -lib -out:libdirac_encoder.a $(libdirac_encoder_a_OBJECTS); link $(LIBFLAGS) -out:libdirac_encoder$(LIBEXT) $(LDFLAGS) $(libdirac_encoder_a_OBJECTS) $(libdirac_encoder_a_DEPENDENCIES); echo
  66 -else
  67 -libdirac_encoder_a_AR = ar crv
  68  lib_LTLIBRARIES = libdirac_encoder.la
  69 -endif
  70 -
  71 -libdirac_encoder_a_SOURCES = $(h_sources) $(cpp_sources)
  72 -
  73 -libdirac_encoder_a_LIBADD = \
  74 -               $(top_builddir)/libdirac_motionest/libdirac_motionest.a \
  75 -               $(top_builddir)/libdirac_common/libdirac_common.a \
  76 -               $(top_builddir)/libdirac_byteio/libdirac_byteio.a
  77
  78  libdirac_encoder_la_SOURCES = $(h_sources) $(cpp_sources)
  79  libdirac_encoder_la_CXXFLAGS = $(AM_CXXFLAGS)
  80 --- dirac-0.5.1/libdirac_common/Makefile.am.orig        2004-12-10 16:28:42.000000000 +0100
  81 +++ dirac-0.5.1/libdirac_common/Makefile.am     2005-03-03 13:09:50.814470720 +0100
  82 @@ -14,17 +14,9 @@
  83                cmd_line.cpp dirac_assertions.cpp
  84
  85
  86 -if USE_MSVC
  87 -noinst_LIBRARIES = libdirac_common.a
  88 -libdirac_common_a_AR = link.exe -lib /out:libdirac_common.a $(libdirac_common_a_OBJECTS) ; echo
  89 -libdirac_common_a_SOURCES = $(h_sources) $(cpp_sources)
  90 -else
  91 -libdirac_common_a_AR = ar crv
  92  noinst_LTLIBRARIES = libdirac_common.la
  93  libdirac_common_la_SOURCES = $(h_sources) $(cpp_sources)
  94  libdirac_common_la_CXXFLAGS = $(AM_CXXFLAGS)
  95 -endif
  96 -
  97
  98
  99  library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/libdirac_common
 100 --- dirac-0.5.0/configure.ac.orig       2004-11-26 14:28:30.000000000 +0100
 101 +++ dirac-0.5.0/configure.ac    2004-12-03 23:21:01.371738096 +0100
 102 @@ -240,7 +240,7 @@
 103  dnl -----------------------------------------------
 104  dnl Check if static libraries to be used on non-Windows platforms
 105  dnl -----------------------------------------------
 106 -AM_CONDITIONAL(USE_STATIC, test x"$enable_static" = "xyes")
 107 +AM_CONDITIONAL(USE_STATIC, false)
 108
 109  dnl -----------------------------------------------
 110  dnl Setup valgrind and necessary args for memcheck