]>
Commit | Line | Data |
---|---|---|
f8839d0a | 1 | diff -urN aa/dirac-0.3.1/configure.ac dirac-0.3.1/configure.ac |
2 | --- aa/dirac-0.3.1/configure.ac 2004-06-08 18:03:15.000000000 +0200 | |
3 | +++ dirac-0.3.1/configure.ac 2004-08-02 20:08:39.074281184 +0200 | |
4 | @@ -54,7 +54,7 @@ | |
5 | dnl ----------------------------------------------- | |
6 | ||
7 | AC_PROG_CXX | |
8 | -AC_PROG_RANLIB | |
9 | +AC_PROG_LIBTOOL | |
10 | AM_SANITY_CHECK | |
11 | ||
12 | dnl ----------------------------------------------- | |
13 | diff -urN aa/dirac-0.3.1/decoder/Makefile.am dirac-0.3.1/decoder/Makefile.am | |
14 | --- aa/dirac-0.3.1/decoder/Makefile.am 2004-05-14 19:20:33.000000000 +0200 | |
15 | +++ dirac-0.3.1/decoder/Makefile.am 2004-08-02 20:14:45.932510256 +0200 | |
16 | @@ -3,5 +3,5 @@ | |
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 | DEFS = -I. -I.. -I../.. -I$(srcdir) | |
23 | diff -urN aa/dirac-0.3.1/encoder/Makefile.am dirac-0.3.1/encoder/Makefile.am | |
24 | --- aa/dirac-0.3.1/encoder/Makefile.am 2004-05-14 19:20:33.000000000 +0200 | |
25 | +++ dirac-0.3.1/encoder/Makefile.am 2004-08-02 20:14:38.347663328 +0200 | |
26 | @@ -3,5 +3,5 @@ | |
27 | ||
28 | dirac_encoder_SOURCES = encmain.cpp | |
29 | ||
30 | -LDADD = ../libdirac_encoder/libdirac_encoder.a ../libdirac_common/libdirac_common.a ../libdirac_motionest/libdirac_motionest.a | |
31 | +LDADD = ../libdirac_encoder/libdirac_encoder.la ../libdirac_common/libdirac_common.la ../libdirac_motionest/libdirac_motionest.la | |
32 | DEFS = -I.. -I. -I../.. -I$(srcdir) | |
33 | diff -urN aa/dirac-0.3.1/libdirac_common/Makefile.am dirac-0.3.1/libdirac_common/Makefile.am | |
34 | --- aa/dirac-0.3.1/libdirac_common/Makefile.am 2004-05-12 10:21:52.000000000 +0200 | |
35 | +++ dirac-0.3.1/libdirac_common/Makefile.am 2004-08-02 20:10:13.615908672 +0200 | |
36 | @@ -11,9 +11,9 @@ | |
37 | mv_codec.cpp pic_io.cpp upconvert.cpp wavelet_utils.cpp \ | |
38 | cmd_line.cpp | |
39 | ||
40 | -lib_LIBRARIES = libdirac_common.a | |
41 | +lib_LTLIBRARIES = libdirac_common.la | |
42 | ||
43 | -libdirac_common_a_SOURCES = $(h_sources) $(cpp_sources) | |
44 | +libdirac_common_la_SOURCES = $(h_sources) $(cpp_sources) | |
45 | ||
46 | library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME) | |
47 | library_include_HEADERS = $(h_sources) | |
48 | diff -urN aa/dirac-0.3.1/libdirac_decoder/Makefile.am dirac-0.3.1/libdirac_decoder/Makefile.am | |
49 | --- aa/dirac-0.3.1/libdirac_decoder/Makefile.am 2004-05-11 18:11:17.000000000 +0200 | |
50 | +++ dirac-0.3.1/libdirac_decoder/Makefile.am 2004-08-02 20:10:47.919693704 +0200 | |
51 | @@ -5,9 +5,9 @@ | |
52 | ||
53 | cpp_sources = comp_decompress.cpp frame_decompress.cpp seq_decompress.cpp | |
54 | ||
55 | -lib_LIBRARIES = libdirac_decoder.a | |
56 | +lib_LTLIBRARIES = libdirac_decoder.la | |
57 | ||
58 | -libdirac_decoder_a_SOURCES = $(h_sources) $(cpp_sources) | |
59 | +libdirac_decoder_la_SOURCES = $(h_sources) $(cpp_sources) | |
60 | ||
61 | library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME) | |
62 | library_include_HEADERS = $(h_sources) | |
63 | diff -urN aa/dirac-0.3.1/libdirac_encoder/Makefile.am dirac-0.3.1/libdirac_encoder/Makefile.am | |
64 | --- aa/dirac-0.3.1/libdirac_encoder/Makefile.am 2004-05-11 18:11:17.000000000 +0200 | |
65 | +++ dirac-0.3.1/libdirac_encoder/Makefile.am 2004-08-02 20:10:34.675707096 +0200 | |
66 | @@ -5,9 +5,9 @@ | |
67 | ||
68 | cpp_sources = comp_compress.cpp frame_compress.cpp seq_compress.cpp | |
69 | ||
70 | -lib_LIBRARIES = libdirac_encoder.a | |
71 | +lib_LTLIBRARIES = libdirac_encoder.la | |
72 | ||
73 | -libdirac_encoder_a_SOURCES = $(h_sources) $(cpp_sources) | |
74 | +libdirac_encoder_la_SOURCES = $(h_sources) $(cpp_sources) | |
75 | ||
76 | library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME) | |
77 | library_include_HEADERS = $(h_sources) | |
78 | diff -urN aa/dirac-0.3.1/libdirac_motionest/Makefile.am dirac-0.3.1/libdirac_motionest/Makefile.am | |
79 | --- aa/dirac-0.3.1/libdirac_motionest/Makefile.am 2004-05-11 18:11:17.000000000 +0200 | |
80 | +++ dirac-0.3.1/libdirac_motionest/Makefile.am 2004-08-02 20:10:25.724067952 +0200 | |
81 | @@ -5,9 +5,9 @@ | |
82 | ||
83 | cpp_sources = block_match.cpp downconvert.cpp me_mode_decn.cpp me_subpel.cpp me_utils.cpp motion_estimate.cpp | |
84 | ||
85 | -lib_LIBRARIES = libdirac_motionest.a | |
86 | +lib_LTLIBRARIES = libdirac_motionest.la | |
87 | ||
88 | -libdirac_motionest_a_SOURCES = $(h_sources) $(cpp_sources) | |
89 | +libdirac_motionest_la_SOURCES = $(h_sources) $(cpp_sources) | |
90 | ||
91 | library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME) | |
92 | library_include_HEADERS = $(h_sources) | |
93 | diff -urN aa/dirac-0.3.1/picheader/Makefile.am dirac-0.3.1/picheader/Makefile.am | |
94 | --- aa/dirac-0.3.1/picheader/Makefile.am 2004-05-14 19:20:33.000000000 +0200 | |
95 | +++ dirac-0.3.1/picheader/Makefile.am 2004-08-02 20:14:55.842003784 +0200 | |
96 | @@ -2,5 +2,5 @@ | |
97 | ||
98 | make_header_SOURCES = headmain.cpp | |
99 | ||
100 | -LDADD = ../libdirac_common/libdirac_common.a | |
101 | +LDADD = ../libdirac_common/libdirac_common.la | |
102 | DEFS = -I.. -I. -I../.. -I$(srcdir) | |
103 | diff -urN aa/dirac-0.3.1/util/conversion/common/Makefile.am dirac-0.3.1/util/conversion/common/Makefile.am | |
104 | --- aa/dirac-0.3.1/util/conversion/common/Makefile.am 2004-05-28 16:15:54.000000000 +0200 | |
105 | +++ dirac-0.3.1/util/conversion/common/Makefile.am 2004-08-02 20:09:56.197556664 +0200 | |
106 | @@ -5,9 +5,9 @@ | |
107 | ||
108 | cpp_sources = setstdiomode.cpp bitmap.cpp | |
109 | ||
110 | -lib_LIBRARIES = libconv_common.a | |
111 | +lib_LTLIBRARIES = libconv_common.la | |
112 | ||
113 | -libconv_common_a_SOURCES = $(h_sources) $(cpp_sources) | |
114 | +libconv_common_la_SOURCES = $(h_sources) $(cpp_sources) | |
115 | ||
116 | library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME) | |
117 | library_include_HEADERS = $(h_sources) | |
118 | diff -urN aa/dirac-0.3.1/util/conversion/Makefile.am dirac-0.3.1/util/conversion/Makefile.am | |
119 | --- aa/dirac-0.3.1/util/conversion/Makefile.am 2004-05-28 16:27:19.000000000 +0200 | |
120 | +++ dirac-0.3.1/util/conversion/Makefile.am 2004-08-02 20:14:16.012058856 +0200 | |
121 | @@ -16,7 +16,7 @@ | |
122 | UYVYtoRGB_SOURCES=UYVYtoRGB.cpp | |
123 | BMPtoRGB_SOURCES=BMPtoRGB.cpp | |
124 | ||
125 | -LDADD = common/libconv_common.a | |
126 | +LDADD = common/libconv_common.la | |
127 | DEFS = -I.. -I. -I../.. -Icommon/ -I$(srcdir) | |
128 | ||
129 | SUBDIRS=common |