← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libdv/trusty

« back to all changes in this revision

Viewing changes to libdv/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Kobras
  • Date: 2006-09-26 14:22:15 UTC
  • mfrom: (1.3.1 upstream) (3.1.4 edgy)
  • Revision ID: james.westby@ubuntu.com-20060926142215-q2arp4stpw6lrb5p
Tags: 1.0.0-1
* New upstream version.
* Removed patches:
  + [01_changelog_update_CVS]
  + [10_amd64_linkage_fix_CVS]
  + [10_inline_fixes_CVS]
  + [20_no_exec_stack_CVS]
  + [30_unload_memleak_fix_CVS]
  + [40_playdv_exit_fix_CVS]
  + [50_gcc41_asm_constraint_fixes_CVS]
    All of the above are part of the new upstream version.
* debian/control: In Build-Depends, remove alternative dependencies on
  obsolete SDL and X packages.
* debian/control: Complies with version 3.7.2 of Debian policy.
* debian/libdv4.README.Debian: Document lack of position-independent code
  in i386 version of libdv's shared library as mandated by recent versions
  of Debian policy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdv/Makefile.am
9
9
 
10
10
if HOST_X86
11
11
GASMOFF=gasmoff
12
 
else # HOST_X86
13
 
GASMOFF=
14
12
endif # HOST_X86
15
13
 
 
14
if HOST_X86_64
 
15
GASMOFF=gasmoff
 
16
endif # HOST_X86_64
 
17
 
 
18
 
16
19
noinst_PROGRAMS= dovlc testvlc testbitstream $(GASMOFF) recode reppm enctest
17
20
 
18
21
#
25
28
libdv_la_ASMS= vlc_x86.S quant_x86.S idct_block_mmx.S dct_block_mmx.S rgbtoyuv.S encode_x86.S transpose_x86.S
26
29
libdv_la_ASM_HS=asmoff.h  mmx.h 
27
30
 
28
 
 
29
31
gasmoff_SOURCES= gasmoff.c bitstream.h 
30
32
 
31
 
else # HOST_X86
32
 
 
33
 
ASMS=
34
 
gasmoff_SOURCES=
35
 
 
36
33
endif # HOST_X86
37
34
 
 
35
#
 
36
# If HOST_X86_64 is set, we build all the x86_64 asm stuff..
 
37
#
 
38
if HOST_X86_64
 
39
 
 
40
BUILT_SOURCES = asmoff.h
 
41
 
 
42
libdv_la_ASMS= vlc_x86_64.S quant_x86_64.S idct_block_mmx_x86_64.S dct_block_mmx_x86_64.S rgbtoyuv_x86_64.S encode_x86_64.S transpose_x86_64.S
 
43
libdv_la_ASM_HS=asmoff.h  mmx.h
 
44
 
 
45
gasmoff_SOURCES= gasmoff.c bitstream.h
 
46
 
 
47
endif # HOST_X86_64
 
48
 
38
49
pkginclude_HEADERS=  dv_types.h dv.h
39
50
 
40
51
noinst_HEADERS=  YUY2.h      bitstream.h parse.h  rgb.h \
48
59
        encode.c headers.c enc_input.c enc_audio_input.c enc_output.c \
49
60
        $(libdv_la_ASMS)
50
61
 
51
 
libdv_la_LDFLAGS = -version-info 4:1:0
 
62
libdv_la_LDFLAGS = -version-info 4:3:0
52
63
 
53
64
dovlc_SOURCES= dovlc.c 
54
65
dovlc_LDADD= libdv.la
77
88
        ./gasmoff > asmoff.h
78
89
 
79
90
endif
 
91
 
 
92
if HOST_X86_64
 
93
 
 
94
# Automake doesn't do dependency tracking for asm
 
95
quant_x86_64.lo vlc_x86_64.lo: asmoff.h
 
96
 
 
97
asmoff.h: gasmoff
 
98
        ./gasmoff > asmoff.h
 
99
 
 
100
endif