Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(422980)

Delta Between Two Patch Sets: Makefile.am

Issue 547: Added filter prior to encoding giving BDR gains on certain sequences like KristenAndSara.
Left Patch Set: Created 4 years, 11 months ago
Right Patch Set: Added filter prior to encoding giving BDR gains on certain sequences like KristenAndSara. Created 4 years, 5 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | examples/encoder_example.c » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 # Libraries 1 # Libraries
2 2
3 # Provide the full test output for failed tests when using the parallel 3 # Provide the full test output for failed tests when using the parallel
4 # test suite (which is enabled by default with automake 1.13+). 4 # test suite (which is enabled by default with automake 1.13+).
5 export VERBOSE = yes 5 export VERBOSE = yes
6 6
7 lib_LTLIBRARIES = src/libdaalabase.la src/libdaaladec.la src/libdaalaenc.la 7 lib_LTLIBRARIES = src/libdaalabase.la src/libdaaladec.la src/libdaalaenc.la
8 8
9 AM_CPPFLAGS = -I$(srcdir)/include 9 AM_CPPFLAGS = -I$(srcdir)/include
10 10
(...skipping 15 matching lines...) Expand all
26 src/laplace_code.h \ 26 src/laplace_code.h \
27 src/logging.h \ 27 src/logging.h \
28 src/mc.h \ 28 src/mc.h \
29 src/mcenc.h \ 29 src/mcenc.h \
30 src/odintrin.h \ 30 src/odintrin.h \
31 src/partition.h \ 31 src/partition.h \
32 src/pvq.h \ 32 src/pvq.h \
33 src/pvq_code.h \ 33 src/pvq_code.h \
34 src/state.h \ 34 src/state.h \
35 src/tf.h \ 35 src/tf.h \
36 src/zigzag.h \
36 src/accounting.h \ 37 src/accounting.h \
37 src/x86/cpu.h \ 38 src/x86/cpu.h \
38 src/x86/x86enc.h \ 39 src/x86/x86enc.h \
40 src/x86/x86dct.h \
39 src/x86/x86int.h 41 src/x86/x86int.h
40 42
41 src_dct_SOURCES = src/dct.c src/tf.c src/internal.c 43 src_dct_SOURCES = src/dct.c src/internal.c
42 if ENABLE_X86ASM 44 if ENABLE_X86ASM
43 src_dct_SOURCES += src/x86/cpu.c 45 src_dct_SOURCES += src/x86/cpu.c
44 if ENABLE_SSE2_INTRINSICS 46 if ENABLE_SSE2_INTRINSICS
45 src_dct_SOURCES += src/x86/sse2dct.c 47 src_dct_SOURCES += src/x86/sse2dct.c
48 %sse2dct.o %sse2dct.lo: CFLAGS += -msse2
46 endif 49 endif
47 if ENABLE_SSE41_INTRINSICS 50 if ENABLE_SSE41_INTRINSICS
48 src_dct_SOURCES += src/x86/sse41dct.c 51 src_dct_SOURCES += src/x86/sse41dct.c
52 %sse41dct.o %sse41dct.lo: CFLAGS += -msse4.1
49 endif 53 endif
50 if ENABLE_AVX2_INTRINSICS 54 if ENABLE_AVX2_INTRINSICS
51 src_dct_SOURCES += src/x86/avx2dct.c 55 src_dct_SOURCES += src/x86/avx2dct.c
56 %avx2dct.o %avx2dct.lo: CFLAGS += -mavx2
52 endif 57 endif
53 endif 58 endif
54 59
55 src_libdaalabase_la_CFLAGS = $(OGG_CFLAGS) 60 src_libdaalabase_la_CFLAGS = $(OGG_CFLAGS)
56 src_libdaalabase_la_LIBADD = $(OGG_LIBS) $(LIBM) 61 src_libdaalabase_la_LIBADD = $(OGG_LIBS) $(LIBM)
57 if DUMP_IMAGES 62 if DUMP_IMAGES
58 src_libdaalabase_la_LIBADD += $(PNG_LIBS) 63 src_libdaalabase_la_LIBADD += $(PNG_LIBS)
59 endif 64 endif
60 src_libdaalabase_la_LDFLAGS = -no-undefined \ 65 src_libdaalabase_la_LDFLAGS = -no-undefined \
61 -version-info @OD_LT_CURRENT@:@OD_LT_REVISION@:@OD_LT_AGE@ 66 -version-info @OD_LT_CURRENT@:@OD_LT_REVISION@:@OD_LT_AGE@
(...skipping 11 matching lines...) Expand all
73 src/laplace_decoder.c \ 78 src/laplace_decoder.c \
74 src/laplace_tables.c \ 79 src/laplace_tables.c \
75 src/logging.c \ 80 src/logging.c \
76 src/mc.c \ 81 src/mc.c \
77 src/partition.c \ 82 src/partition.c \
78 src/pvq.c \ 83 src/pvq.c \
79 src/pvq_code.c \ 84 src/pvq_code.c \
80 src/pvq_decoder.c \ 85 src/pvq_decoder.c \
81 src/state.c \ 86 src/state.c \
82 src/switch_table.c \ 87 src/switch_table.c \
88 src/tf.c \
83 src/zigzag4.c \ 89 src/zigzag4.c \
84 src/zigzag8.c \ 90 src/zigzag8.c \
85 src/zigzag16.c \ 91 src/zigzag16.c \
86 src/zigzag32.c \ 92 src/zigzag32.c \
87 $(src_dct_SOURCES) 93 $(src_dct_SOURCES)
88 if ENABLE_X86ASM 94 if ENABLE_X86ASM
89 src_libdaalabase_la_SOURCES += \ 95 src_libdaalabase_la_SOURCES += \
90 src/x86/sse2mc.c \ 96 src/x86/sse2mc.c \
91 src/x86/x86state.c 97 src/x86/x86state.c
92 endif 98 endif
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 # Example programs 133 # Example programs
128 134
129 noinst_PROGRAMS = \ 135 noinst_PROGRAMS = \
130 examples/dump_video \ 136 examples/dump_video \
131 examples/encoder_example 137 examples/encoder_example
132 138
133 if ENABLE_PLAYER_EXAMPLE 139 if ENABLE_PLAYER_EXAMPLE
134 noinst_PROGRAMS += examples/player_example 140 noinst_PROGRAMS += examples/player_example
135 endif 141 endif
136 142
143 if ENABLE_ANALYZER
144 noinst_PROGRAMS += examples/analyzer
145 endif
146
137 examples_dump_video_SOURCES = examples/dump_video.c 147 examples_dump_video_SOURCES = examples/dump_video.c
138 examples_dump_video_CFLAGS = $(OGG_CFLAGS) 148 examples_dump_video_CFLAGS = $(OGG_CFLAGS)
139 examples_dump_video_LDADD = src/libdaalabase.la src/libdaaladec.la $(OGG_LIBS) 149 examples_dump_video_LDADD = src/libdaalabase.la src/libdaaladec.la $(OGG_LIBS)
140 150
141 examples_encoder_example_SOURCES = \ 151 examples_encoder_example_SOURCES = \
142 examples/encoder_example.c \ 152 examples/encoder_example.c \
143 examples/prefilter.c 153 examples/prefilter.c
144 examples_encoder_example_CFLAGS = $(OGG_CFLAGS) 154 examples_encoder_example_CFLAGS = $(OGG_CFLAGS)
145 examples_encoder_example_LDADD = src/libdaalabase.la src/libdaalaenc.la $(OGG_LI BS) $(LIBM) 155 examples_encoder_example_LDADD = src/libdaalabase.la src/libdaalaenc.la $(OGG_LI BS) $(LIBM)
146 156
147 if ENABLE_PLAYER_EXAMPLE 157 if ENABLE_PLAYER_EXAMPLE
148 examples_player_example_SOURCES = examples/player_example.c 158 examples_player_example_SOURCES = examples/player_example.c
149 examples_player_example_CFLAGS = $(OGG_CFLAGS) $(SDL_CFLAGS) 159 examples_player_example_CFLAGS = $(OGG_CFLAGS) $(SDL_CFLAGS)
150 examples_player_example_LDADD = src/libdaalabase.la src/libdaaladec.la $(OGG_LIB S) $(SDL_LIBS) 160 examples_player_example_LDADD = src/libdaalabase.la src/libdaaladec.la $(OGG_LIB S) $(SDL_LIBS)
151 endif 161 endif
152 162
163 if ENABLE_ANALYZER
164 examples_analyzer_SOURCES = examples/analyzer.cc
165 examples_analyzer_CXXFLAGS = $(OGG_CFLAGS) $(WX_CPPFLAGS)
166 examples_analyzer_LDADD = src/libdaalabase.la src/libdaaladec.la $(OGG_LIBS) $(W X_LIBS)
167 endif
168
153 # Includes 169 # Includes
154 170
155 daalaincludedir = $(includedir)/daala 171 daalaincludedir = $(includedir)/daala
156 daalainclude_HEADERS = \ 172 daalainclude_HEADERS = \
157 include/daala/codec.h \ 173 include/daala/codec.h \
158 include/daala/daaladec.h \ 174 include/daala/daaladec.h \
159 include/daala/daalaenc.h 175 include/daala/daalaenc.h
160 176
161 # Tools 177 # Tools
162 178
163 CLEANFILES = 179 CLEANFILES =
164 EXTRA_PROGRAMS = 180 EXTRA_PROGRAMS =
165 181
166 if ENABLE_TOOLS 182 if ENABLE_TOOLS
167 183
168 tools_TARGETS = \ 184 tools_TARGETS = \
169 tools/png2y4m \ 185 tools/png2y4m \
170 tools/y4m2png \ 186 tools/y4m2png \
171 tools/dump_psnrhvs \ 187 tools/dump_psnrhvs \
172 tools/block_size_analysis \ 188 tools/block_size_analysis \
189 tools/to_monochrome \
190 tools/downsample \
191 tools/upsample \
173 tools/divu_const \ 192 tools/divu_const \
174 tools/trans \ 193 tools/trans \
175 tools/trans2d \ 194 tools/trans2d \
176 tools/trans_gain \ 195 tools/trans_gain \
177 tools/gen_cdf \ 196 tools/gen_cdf \
197 tools/compute_basis \
178 tools/gen_laplace_tables \ 198 tools/gen_laplace_tables \
179 tools/dump_ssim \ 199 tools/dump_ssim \
180 tools/dump_fastssim \ 200 tools/dump_fastssim \
181 tools/bjontegaard \ 201 tools/bjontegaard \
182 tools/yuvjpeg \ 202 tools/yuvjpeg \
183 tools/jpegyuv \ 203 tools/jpegyuv \
184 tools/yuv2yuv4mpeg \ 204 tools/yuv2yuv4mpeg \
185 tools/dump_psnr \ 205 tools/dump_psnr \
186 tools/vq_train 206 tools/vq_train
187
188 207
189 noinst_HEADERS += \ 208 noinst_HEADERS += \
190 tools/cholesky.h \ 209 tools/cholesky.h \
191 tools/int_search.h \ 210 tools/int_search.h \
192 tools/kiss99.h \ 211 tools/kiss99.h \
193 tools/matidx.h \ 212 tools/matidx.h \
194 tools/od_defs.h \ 213 tools/od_defs.h \
195 tools/od_filter.h \ 214 tools/od_filter.h \
196 tools/pythag.h \ 215 tools/pythag.h \
197 tools/svd.h \ 216 tools/svd.h \
198 tools/trans_tools.h \ 217 tools/trans_tools.h \
199 tools/vidinput.h 218 tools/vidinput.h
200 219
201 EXTRA_PROGRAMS += $(tools_TARGETS) 220 EXTRA_PROGRAMS += $(tools_TARGETS)
202 CLEANFILES += $(tools_TARGETS) 221 CLEANFILES += $(tools_TARGETS)
203 222
204 # png2y4m 223 # png2y4m
205 tools_png2y4m_SOURCES = \ 224 tools_png2y4m_SOURCES = \
206 tools/kiss99.c \ 225 tools/kiss99.c \
207 tools/png2y4m.c 226 tools/png2y4m.c
208 tools_png2y4m_CFLAGS = $(OGG_CFLAGS) $(PNG_CFLAGS) 227 tools_png2y4m_CFLAGS = $(OGG_CFLAGS) $(PNG_CFLAGS)
209 tools_png2y4m_LDADD = $(OGG_LIBS) $(PNG_LIBS) 228 tools_png2y4m_LDADD = $(OGG_LIBS) $(PNG_LIBS)
210 229
211 # y4m2png 230 # y4m2png
212 tools_y4m2png_SOURCES = \ 231 tools_y4m2png_SOURCES = \
213 tools/vidinput.c \ 232 tools/vidinput.c \
214 tools/y4m_input.c \ 233 tools/y4m_input.c \
215 tools/y4m2png.c 234 tools/y4m2png.c
216 tools_y4m2png_CFLAGS = $(THEORA_CFLAGS) $(OGG_CFLAGS) $(PNG_CFLAGS) 235 tools_y4m2png_CFLAGS = $(OGG_CFLAGS) $(PNG_CFLAGS)
217 tools_y4m2png_LDADD = $(THEORA_LIBS) $(OGG_LIBS) $(PNG_LIBS) 236 tools_y4m2png_LDADD = $(OGG_LIBS) $(PNG_LIBS)
218 237
219 # dump_psnrhvs 238 # dump_psnrhvs
220 tools_dump_psnrhvs_SOURCES = \ 239 tools_dump_psnrhvs_SOURCES = \
221 tools/vidinput.c \ 240 tools/vidinput.c \
222 tools/y4m_input.c \ 241 tools/y4m_input.c \
223 $(src_dct_SOURCES) \ 242 $(src_dct_SOURCES) \
224 tools/dump_psnrhvs.c 243 tools/dump_psnrhvs.c
225 tools_dump_psnrhvs_CFLAGS = $(THEORA_CFLAGS) $(OGG_CFLAGS) $(PNG_CFLAGS) 244 tools_dump_psnrhvs_CFLAGS = $(OGG_CFLAGS) $(PNG_CFLAGS)
226 tools_dump_psnrhvs_LDADD = $(THEORA_LIBS) $(OGG_LIBS) $(PNG_LIBS) $(LIBM) 245 tools_dump_psnrhvs_LDADD = $(OGG_LIBS) $(LIBM)
227 246
228 # dump_ssim 247 # dump_ssim
229 tools_dump_ssim_SOURCES = \ 248 tools_dump_ssim_SOURCES = \
230 tools/vidinput.c \ 249 tools/vidinput.c \
231 tools/y4m_input.c \ 250 tools/y4m_input.c \
232 tools/dump_ssim.c 251 tools/dump_ssim.c
233 tools_dump_ssim_CFLAGS = $(THEORA_CFLAGS) $(OGG_CFLAGS) 252 tools_dump_ssim_CFLAGS = $(OGG_CFLAGS)
234 tools_dump_ssim_LDADD = $(THEORA_LIBS) $(OGG_LIBS) $(LIBM) 253 tools_dump_ssim_LDADD = $(OGG_LIBS) $(LIBM)
235 254
236 # dump_fastssim 255 # dump_fastssim
237 tools_dump_fastssim_SOURCES = \ 256 tools_dump_fastssim_SOURCES = \
238 tools/vidinput.c \ 257 tools/vidinput.c \
239 tools/y4m_input.c \ 258 tools/y4m_input.c \
240 tools/dump_fastssim.c 259 tools/dump_fastssim.c
241 tools_dump_fastssim_CFLAGS = $(THEORA_CFLAGS) $(OGG_CFLAGS) 260 tools_dump_fastssim_CFLAGS = $(OGG_CFLAGS)
242 tools_dump_fastssim_LDADD = $(THEORA_LIBS) $(OGG_LIBS) $(LIBM) 261 tools_dump_fastssim_LDADD = $(OGG_LIBS) $(LIBM)
243 262
244 # dump_psnr 263 # dump_psnr
245 tools_dump_psnr_SOURCES = \ 264 tools_dump_psnr_SOURCES = \
246 tools/vidinput.c \ 265 tools/vidinput.c \
247 tools/y4m_input.c \ 266 tools/y4m_input.c \
248 tools/dump_psnr.c 267 tools/dump_psnr.c
249 tools_dump_psnr_CFLAGS = $(THEORA_CFLAGS) $(OGG_CFLAGS) $(PNG_CFLAGS) 268 tools_dump_psnr_CFLAGS = $(OGG_CFLAGS) $(PNG_CFLAGS)
250 tools_dump_psnr_LDADD = $(THEORA_LIBS) $(OGG_LIBS) $(PNG_LIBS) $(LIBM) 269 tools_dump_psnr_LDADD = $(OGG_LIBS) $(LIBM)
251 270
252 # block_size_analysis 271 # block_size_analysis
253 tools_block_size_analysis_SOURCES = \ 272 tools_block_size_analysis_SOURCES = \
254 tools/block_size_analysis.c \ 273 tools/block_size_analysis.c \
255 src/block_size.c \ 274 src/block_size.c \
256 src/block_size_enc.c \ 275 src/block_size_enc.c \
257 tools/vidinput.c \ 276 tools/vidinput.c \
258 tools/y4m_input.c \ 277 tools/y4m_input.c \
259 $(src_dct_SOURCES) \ 278 $(src_dct_SOURCES) \
260 src/generic_encoder.c \ 279 src/generic_encoder.c \
261 src/generic_code.c \ 280 src/generic_code.c \
262 src/laplace_encoder.c \ 281 src/laplace_encoder.c \
263 src/logging.c \ 282 src/logging.c \
264 src/laplace_tables.c \ 283 src/laplace_tables.c \
265 src/entcode.c \ 284 src/entcode.c \
266 src/entenc.c \ 285 src/entenc.c \
267 src/filter.c \ 286 src/filter.c \
268 src/switch_table.c 287 src/switch_table.c
269 tools_block_size_analysis_CFLAGS = $(THEORA_CFLAGS) $(OGG_CFLAGS) $(PNG_CFLAGS) 288 tools_block_size_analysis_CFLAGS = $(OGG_CFLAGS) $(PNG_CFLAGS)
270 tools_block_size_analysis_LDADD = $(THEORA_LIBS) $(OGG_LIBS) $(PNG_LIBS) $(LIBM) 289 tools_block_size_analysis_LDADD = $(OGG_LIBS) $(PNG_LIBS) $(LIBM)
290
291 # to_monochrome
292 tools_to_monochrome_SOURCES = \
293 » tools/vidinput.c \
294 » tools/y4m_input.c \
295 » tools/to_monochrome.c
296 tools_to_monochrome_CFLAGS = $(THEORA_CFLAGS) $(OGG_CFLAGS) $(PNG_CFLAGS)
297 tools_to_monochrome_LDADD = $(THEORA_LIBS) $(OGG_LIBS) $(PNG_LIBS)
298
299 # downsample
300 tools_downsample_SOURCES = \
301 » tools/vidinput.c \
302 » tools/y4m_input.c \
303 » tools/downsample.c
304 tools_downsample_CFLAGS = $(THEORA_CFLAGS) $(OGG_CFLAGS) $(PNG_CFLAGS)
305 tools_downsample_LDADD = $(THEORA_LIBS) $(OGG_LIBS) $(PNG_LIBS)
306
307 # upsample
308 tools_upsample_SOURCES = \
309 » $(src_dct_SOURCES) \
310 » src/generic_code.c \
311 » src/switch_table.c \
312 » src/logging.c \
313 » src/info.c \
314 » src/mc.c \
315 » src/pvq.c \
316 » src/state.c \
317 » tools/vidinput.c \
318 » tools/y4m_input.c \
319 » tools/upsample.c
320 if ENABLE_X86ASM
321 tools_upsample_SOURCES += \
322 » src/x86/sse2mc.c \
323 » src/x86/x86state.c
324 endif
325 tools_upsample_CFLAGS = $(THEORA_CFLAGS) $(OGG_CFLAGS) $(PNG_CFLAGS)
326 tools_upsample_LDADD = $(THEORA_LIBS) $(OGG_LIBS) $(PNG_LIBS) $(LIBM)
271 327
272 # divu_const 328 # divu_const
273 tools_divu_const_SOURCES = \ 329 tools_divu_const_SOURCES = \
274 tools/divu_const.c 330 tools/divu_const.c
275 tools_divu_const_CFLAGS = $(OGG_CFLAGS) 331 tools_divu_const_CFLAGS = $(OGG_CFLAGS)
276 tools_divu_const_LDADD = $(OGG_LIBS) $(LIBM) 332 tools_divu_const_LDADD = $(OGG_LIBS) $(LIBM)
277 333
278 # trans 334 # trans
279 tools_trans_SOURCES = \ 335 tools_trans_SOURCES = \
280 tools/trans.c \ 336 tools/trans.c \
281 tools/vidinput.c \ 337 tools/vidinput.c \
282 tools/y4m_input.c \ 338 tools/y4m_input.c \
283 tools/od_filter.c \ 339 tools/od_filter.c \
284 tools/trans_tools.c \ 340 tools/trans_tools.c \
285 tools/int_search.c \ 341 tools/int_search.c \
286 tools/trans_data.c \ 342 tools/trans_data.c \
287 tools/kiss99.c \ 343 tools/kiss99.c \
288 tools/svd.c \ 344 tools/svd.c \
289 tools/cholesky.c \ 345 tools/cholesky.c \
290 src/filter.c \ 346 src/filter.c \
291 $(src_dct_SOURCES) 347 $(src_dct_SOURCES)
292 tools_trans_CFLAGS = $(THEORA_CFLAGS) $(OGG_CFLAGS) $(PNG_CFLAGS) $(OPENMP_CFLAG S) 348 tools_trans_CFLAGS = $(OGG_CFLAGS) $(PNG_CFLAGS) $(OPENMP_CFLAGS)
293 tools_trans_LDADD = $(THEORA_LIBS) $(OGG_LIBS) $(PNG_LIBS) $(LIBM) 349 tools_trans_LDADD = $(OGG_LIBS) $(PNG_LIBS) $(LIBM)
294 350
295 # trans_gain 351 # trans_gain
296 tools_trans_gain_SOURCES = \ 352 tools_trans_gain_SOURCES = \
297 tools/trans_gain.c \ 353 tools/trans_gain.c \
298 tools/vidinput.c \ 354 tools/vidinput.c \
299 tools/y4m_input.c \ 355 tools/y4m_input.c \
300 tools/od_filter.c \ 356 tools/od_filter.c \
301 tools/trans_tools.c \ 357 tools/trans_tools.c \
302 src/filter.c \ 358 src/filter.c \
303 $(src_dct_SOURCES) 359 $(src_dct_SOURCES)
304 tools_trans_gain_CFLAGS = $(THEORA_CFLAGS) $(OGG_CFLAGS) $(PNG_CFLAGS) $(OPENMP_ CFLAGS) 360 tools_trans_gain_CFLAGS = $(OGG_CFLAGS) $(PNG_CFLAGS) $(OPENMP_CFLAGS)
305 tools_trans_gain_LDADD = $(THEORA_LIBS) $(OGG_LIBS) $(PNG_LIBS) $(LIBM) 361 tools_trans_gain_LDADD = $(OGG_LIBS) $(PNG_LIBS) $(LIBM)
306 362
307 #trans2d 363 #trans2d
308 tools_trans2d_SOURCES = \ 364 tools_trans2d_SOURCES = \
309 tools/trans2d.c \ 365 tools/trans2d.c \
310 tools/vidinput.c \ 366 tools/vidinput.c \
311 tools/y4m_input.c \ 367 tools/y4m_input.c \
312 tools/od_filter.c \ 368 tools/od_filter.c \
313 tools/trans_tools.c \ 369 tools/trans_tools.c \
314 tools/int_search.c \ 370 tools/int_search.c \
315 tools/trans_data.c \ 371 tools/trans_data.c \
316 tools/kiss99.c \ 372 tools/kiss99.c \
317 tools/svd.c \ 373 tools/svd.c \
318 tools/cholesky.c \ 374 tools/cholesky.c \
319 src/filter.c \ 375 src/filter.c \
320 $(src_dct_SOURCES) 376 $(src_dct_SOURCES)
321 tools_trans2d_CFLAGS = $(THEORA_CFLAGS) $(OGG_CFLAGS) $(PNG_CFLAGS) $(OPENMP_CFL AGS) 377 tools_trans2d_CFLAGS = $(OGG_CFLAGS) $(PNG_CFLAGS) $(OPENMP_CFLAGS)
322 tools_trans2d_LDADD = $(THEORA_LIBS) $(OGG_LIBS) $(PNG_LIBS) $(LIBM) 378 tools_trans2d_LDADD = $(OGG_LIBS) $(PNG_LIBS) $(LIBM)
323 379
324 # gen_cdf 380 # gen_cdf
325 tools_gen_cdf_SOURCES = \ 381 tools_gen_cdf_SOURCES = \
326 tools/gen_cdf.c 382 tools/gen_cdf.c
327 tools_gen_cdf_CFLAGS = $(OGG_CFLAGS) $(PNG_CFLAGS) 383 tools_gen_cdf_CFLAGS = $(OGG_CFLAGS) $(PNG_CFLAGS)
328 tools_gen_cdf_LDADD = $(OGG_LIBS) $(PNG_LIBS) $(LIBM) 384 tools_gen_cdf_LDADD = $(OGG_LIBS) $(PNG_LIBS) $(LIBM)
385
386 # compute_basis
387 tools_compute_basis_SOURCES = \
388 tools/compute_basis.c \
389 src/dct.c \
390 src/filter.c \
391 src/internal.c
392 tools_compute_basis_CFLAGS = $(OGG_CFLAGS)
393 tools_compute_basis_LDADD = $(OGG_LIBS) $(LIBM)
329 394
330 # gen_laplace_tables 395 # gen_laplace_tables
331 tools_gen_laplace_tables_SOURCES = \ 396 tools_gen_laplace_tables_SOURCES = \
332 tools/gen_laplace_tables.c 397 tools/gen_laplace_tables.c
333 tools_gen_laplace_tables_CFLAGS = $(OGG_CFLAGS) $(PNG_CFLAGS) 398 tools_gen_laplace_tables_CFLAGS = $(OGG_CFLAGS) $(PNG_CFLAGS)
334 tools_gen_laplace_tables_LDADD = $(OGG_LIBS) $(PNG_LIBS) $(LIBM) 399 tools_gen_laplace_tables_LDADD = $(OGG_LIBS) $(PNG_LIBS) $(LIBM)
335 400
336 # bjontegaard 401 # bjontegaard
337 tools_bjontegaard_SOURCES = \ 402 tools_bjontegaard_SOURCES = \
338 tools/bjontegaard.c \ 403 tools/bjontegaard.c \
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 echo "Installing documentation in $(DESTDIR)$(docdir)"; \ 558 echo "Installing documentation in $(DESTDIR)$(docdir)"; \
494 $(INSTALL) -d $(DESTDIR)$(docdir)/html/search; \ 559 $(INSTALL) -d $(DESTDIR)$(docdir)/html/search; \
495 for f in `find html -type f \! -name "installdox"` ; do \ 560 for f in `find html -type f \! -name "installdox"` ; do \
496 $(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/$$f; \ 561 $(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/$$f; \
497 done ) \ 562 done ) \
498 fi 563 fi
499 564
500 doc/doxygen-build.stamp: doc/Doxyfile $(daalainclude_HEADERS) 565 doc/doxygen-build.stamp: doc/Doxyfile $(daalainclude_HEADERS)
501 @[ -n "$(NO_DOXYGEN)" ] || ( cd doc && doxygen && touch $(@F) ) 566 @[ -n "$(NO_DOXYGEN)" ] || ( cd doc && doxygen && touch $(@F) )
502 567
503
504 if HAVE_DOXYGEN 568 if HAVE_DOXYGEN
505 569
506 # Or everything (by default) 570 # Or everything (by default)
507 all-local: docs 571 all-local: docs
508 572
509 install-data-local: install-docs 573 install-data-local: install-docs
510 574
511 clean-local: 575 clean-local:
512 $(RM) -r doc/html 576 $(RM) -r doc/html
513 $(RM) -r doc/latex 577 $(RM) -r doc/latex
514 $(RM) -r doc/man 578 $(RM) -r doc/man
515 $(RM) doc/doxygen-build.stamp 579 $(RM) doc/doxygen-build.stamp
580 $(RM) doc/doxygen_sqlite3.db
516 581
517 uninstall-local: 582 uninstall-local:
518 $(RM) -r $(DESTDIR)$(docdir)/html 583 $(RM) -r $(DESTDIR)$(docdir)/html
519 584
520 endif 585 endif
521 586
522 # We check this every time make is run, with configure.ac being touched to 587 # We check this every time make is run, with configure.ac being touched to
523 # trigger an update of the build system files if update_version changes the 588 # trigger an update of the build system files if update_version changes the
524 # current PACKAGE_VERSION (or if package_version was modified manually by a 589 # current PACKAGE_VERSION (or if package_version was modified manually by a
525 # user with either AUTO_UPDATE=no or no update_version script present - the 590 # user with either AUTO_UPDATE=no or no update_version script present - the
(...skipping 22 matching lines...) Expand all
548 fi; \ 613 fi; \
549 touch $@ 614 touch $@
550 615
551 force: 616 force:
552 617
553 # Create a minimal package_version file when make dist is run. 618 # Create a minimal package_version file when make dist is run.
554 dist-hook: 619 dist-hook:
555 echo 'PACKAGE_VERSION="$(PACKAGE_VERSION)"' > $(top_distdir)/package_ver sion 620 echo 'PACKAGE_VERSION="$(PACKAGE_VERSION)"' > $(top_distdir)/package_ver sion
556 621
557 .PHONY: daala install-daala docs install-docs figures tools 622 .PHONY: daala install-daala docs install-docs figures tools
LEFTRIGHT

RSS Feeds Recent Issues | This issue
This is Rietveld