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
5 cpp_sources = block_match.cpp downconvert.cpp me_mode_decn.cpp me_subpel.cpp me_utils.cpp motion_estimate.cpp pixel_match.cpp
8 -noinst_LIBRARIES = libdirac_motionest.a
9 -libdirac_motionest_a_AR = link.exe -lib /out:libdirac_motionest.a $(libdirac_motionest_a_OBJECTS) ; echo
11 -libdirac_motionest_a_AR = ar crv
12 noinst_LTLIBRARIES = libdirac_motionest.la
15 -libdirac_motionest_a_SOURCES = $(h_sources) $(cpp_sources)
17 libdirac_motionest_la_SOURCES = $(h_sources) $(cpp_sources)
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
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
26 -noinst_LIBRARIES = libdirac_instrument.a
27 -libdirac_instrument_a_AR = link.exe -lib /out:libdirac_instrument.a $(libdirac_instrument_a_OBJECTS) ; echo
29 noinst_LTLIBRARIES = libdirac_instrument.la
30 -libdirac_instrument_a_AR = ar crv
33 -libdirac_instrument_a_SOURCES = $(h_sources) $(cpp_sources)
35 libdirac_instrument_la_SOURCES = $(h_sources) $(cpp_sources)
36 libdirac_instrument_la_CXXFLAGS = $(AM_CXXFLAGS)
37 --- dirac-0.5.0/libdirac_decoder/Makefile.am.orig 2004-11-22 14:54:47.000000000 +0100
38 +++ dirac-0.5.0/libdirac_decoder/Makefile.am 2004-12-03 23:07:00.199615696 +0100
40 cpp_sources = comp_decompress.cpp frame_decompress.cpp seq_decompress.cpp \
41 dirac_cppparser.cpp dirac_parser.cpp
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
47 lib_LTLIBRARIES = libdirac_decoder.la
49 -libdirac_decoder_a_SOURCES = $(h_sources) $(cpp_sources)
51 -libdirac_decoder_a_LIBADD = \
52 - $(top_builddir)/libdirac_common/libdirac_common.a
54 libdirac_decoder_la_SOURCES = $(h_sources) $(cpp_sources)
56 --- dirac-0.5.0/libdirac_encoder/Makefile.am.orig 2004-11-22 14:54:47.000000000 +0100
57 +++ dirac-0.5.0/libdirac_encoder/Makefile.am 2004-12-03 23:07:19.411695016 +0100
59 seq_compress.cpp dirac_encoder.cpp
63 -lib_LIBRARIES = libdirac_encoder.a
64 -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 -libdirac_encoder_a_AR = ar crv
67 lib_LTLIBRARIES = libdirac_encoder.la
70 -libdirac_encoder_a_SOURCES = $(h_sources) $(cpp_sources)
72 -libdirac_encoder_a_LIBADD = \
73 - $(top_builddir)/libdirac_motionest/libdirac_motionest.a \
74 - $(top_builddir)/libdirac_common/libdirac_common.a
76 libdirac_encoder_la_SOURCES = $(h_sources) $(cpp_sources)
77 libdirac_encoder_la_LIBADD = \
78 --- dirac-0.5.1/libdirac_common/Makefile.am.orig 2004-12-10 16:28:42.000000000 +0100
79 +++ dirac-0.5.1/libdirac_common/Makefile.am 2005-03-03 13:09:50.814470720 +0100
81 cmd_line.cpp dirac_assertions.cpp
85 -noinst_LIBRARIES = libdirac_common.a
86 -libdirac_common_a_AR = link.exe -lib /out:libdirac_common.a $(libdirac_common_a_OBJECTS) ; echo
87 -libdirac_common_a_SOURCES = $(h_sources) $(cpp_sources)
89 -libdirac_common_a_AR = ar crv
90 noinst_LTLIBRARIES = libdirac_common.la
91 libdirac_common_la_SOURCES = $(h_sources) $(cpp_sources)
92 libdirac_common_la_CXXFLAGS = $(AM_CXXFLAGS)
97 library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/libdirac_common
98 --- dirac-0.5.0/configure.ac.orig 2004-11-26 14:28:30.000000000 +0100
99 +++ dirac-0.5.0/configure.ac 2004-12-03 23:21:01.371738096 +0100
101 dnl -----------------------------------------------
102 dnl Check if static libraries to be used on non-Windows platforms
103 dnl -----------------------------------------------
104 -AM_CONDITIONAL(USE_STATIC, test x"$enable_static" = "xyes")
105 +AM_CONDITIONAL(USE_STATIC, false)
107 dnl -----------------------------------------------
108 dnl Setup valgrind and necessary args for memcheck