]>
Commit | Line | Data |
---|---|---|
da3afdad JB |
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.0/util/instrumentation/libdirac_instrument/Makefile.am.orig 2004-11-22 14:54:48.000000000 +0100 | |
20 | +++ dirac-0.5.0/util/instrumentation/libdirac_instrument/Makefile.am 2004-12-03 23:08:44.080823352 +0100 | |
21 | @@ -7,15 +7,8 @@ | |
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 | libdirac_instrument_la_SOURCES = $(h_sources) $(cpp_sources) | |
35 | ||
36 | if USE_MSVC | |
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 | |
39 | @@ -9,16 +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 | ||
54 | libdirac_decoder_la_SOURCES = $(h_sources) $(cpp_sources) | |
55 | ||
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 | |
58 | @@ -10,19 +10,7 @@ | |
59 | seq_compress.cpp dirac_encoder.cpp | |
60 | ||
61 | ||
62 | -if USE_MSVC | |
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 | |
65 | -else | |
66 | -libdirac_encoder_a_AR = ar crv | |
67 | lib_LTLIBRARIES = libdirac_encoder.la | |
68 | -endif | |
69 | - | |
70 | -libdirac_encoder_a_SOURCES = $(h_sources) $(cpp_sources) | |
71 | - | |
72 | -libdirac_encoder_a_LIBADD = \ | |
73 | - $(top_builddir)/libdirac_motionest/libdirac_motionest.a \ | |
74 | - $(top_builddir)/libdirac_common/libdirac_common.a | |
75 | ||
76 | libdirac_encoder_la_SOURCES = $(h_sources) $(cpp_sources) | |
77 | libdirac_encoder_la_LIBADD = \ | |
78 | --- dirac-0.5.0/libdirac_common/Makefile.am.orig 2004-11-22 14:54:47.000000000 +0100 | |
79 | +++ dirac-0.5.0/libdirac_common/Makefile.am 2004-12-03 23:07:32.027777080 +0100 | |
80 | @@ -14,15 +14,7 @@ | |
81 | cmd_line.cpp dirac_assertions.cpp | |
82 | ||
83 | ||
84 | -if USE_MSVC | |
85 | -noinst_LIBRARIES = libdirac_common.a | |
86 | -libdirac_common_a_AR = link.exe -lib /out:libdirac_common.a $(libdirac_common_a_OBJECTS) ; echo | |
87 | -else | |
88 | -libdirac_common_a_AR = ar crv | |
89 | noinst_LTLIBRARIES = libdirac_common.la | |
90 | -endif | |
91 | - | |
92 | -libdirac_common_a_SOURCES = $(h_sources) $(cpp_sources) | |
93 | ||
94 | libdirac_common_la_SOURCES = $(h_sources) $(cpp_sources) | |
95 | ||
96 | --- dirac-0.5.0/configure.ac.orig 2004-11-26 14:28:30.000000000 +0100 | |
97 | +++ dirac-0.5.0/configure.ac 2004-12-03 23:21:01.371738096 +0100 | |
98 | @@ -240,7 +240,7 @@ | |
99 | dnl ----------------------------------------------- | |
100 | dnl Check if static libraries to be used on non-Windows platforms | |
101 | dnl ----------------------------------------------- | |
102 | -AM_CONDITIONAL(USE_STATIC, test x"$enable_static" = "xyes") | |
103 | +AM_CONDITIONAL(USE_STATIC, false) | |
104 | ||
105 | dnl ----------------------------------------------- | |
106 | dnl Setup valgrind and necessary args for memcheck |