← Back to branch summary

~ubuntu-branches/ubuntu/edgy/xorg-server/edgy-updates

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Parra Novo
  • Date: 2006-07-25 20:06:28 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060725200628-gjmmd9gxfxdc4ejs
Tags: 1:1.1.1-0ubuntu1
* New Upstream version
* Changed Build-Depends from mesa-swrast-source to mesa-swx11-source,
  following Debian package nomenclature
* Re-did 12_security_policy_in_etc.diff for 1.1.1
* Dropped 15_security_allocate_local.diff (applied upstream)
* Dropped 16_SECURITY_setuid.diff (applied upstream)
* Dropped 000_ubuntu_fix_read_kernel_mapping.patch (applied upstream)
* Dropped 002_ubuntu_fix_for_certain_intel_chipsets.patch (applied upstream)
* Updated versioned Build-Depends on mesa-swx11-source to version
  6.5.0.cvs.20060725-0ubuntu1
* Added arrayobj.c, arrayobj.h, bitset.h & rbadaptors.h to
  GL/symlink-mesa.sh (linked from mesa-swx11-source)
* Added arrayobj.c to default build target on GL/mesa/main

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
1
1
AUTOMAKE_OPTIONS=dist-bzip2 foreign nostdinc
 
2
DISTCHECK_CONFIGURE_FLAGS=--disable-xorgcfg
2
3
 
3
4
if COMPOSITE
4
5
COMPOSITE_DIR=composite
11
12
if CFB
12
13
CFB_DIR=cfb
13
14
CFB16_DIR=cfb16
14
 
# cfb24 is only used by xf8_32wid, which is only used by sunffb on SPARC
15
 
if BUILD_XF8_32WID
16
 
CFB24_DIR=cfb24
17
 
endif
18
15
CFB32_DIR=cfb32
19
16
endif
20
17
 
39
36
LBX_DIR=lbx
40
37
endif
41
38
 
 
39
if XINPUT
 
40
XINPUT_DIR=Xi
 
41
endif
 
42
 
 
43
if DBE
 
44
DBE_DIR=dbe
 
45
endif
 
46
 
42
47
SUBDIRS = \
43
48
        doc \
44
49
        include \
50
55
        os \
51
56
        randr \
52
57
        render  \
53
 
        Xi \
 
58
        $(XINPUT_DIR) \
54
59
        xkb \
55
 
        dbe \
 
60
        $(DBE_DIR) \
56
61
        $(MFB_DIR) \
57
62
        $(AFB_DIR) \
58
63
        $(CFB_DIR) \
59
64
        $(CFB16_DIR) \
60
 
        $(CFB24_DIR) \
61
65
        $(CFB32_DIR) \
62
66
        record \
63
67
        xfixes \
66
70
        $(COMPOSITE_DIR) \
67
71
        $(GLX_DIR) \
68
72
        $(LBX_DIR) \
 
73
        exa \
69
74
        hw \
70
75
        $(XPDDX_DIR) \
71
76
        $(XPCONFIG_DIR)
96
101
        afb \
97
102
        cfb \
98
103
        cfb16 \
99
 
        cfb24 \
100
104
        cfb32 \
101
 
        ilbm \
102
 
        iplan2p4 \
103
105
        record \
104
106
        xfixes \
105
107
        damageext \
106
108
        XTrap \
107
109
        composite \
108
110
        GL \
 
111
        exa \
109
112
        hw \
110
113
        Xprint \
111
114
        XpConfig \
112
115
        lbx
 
116
 
 
117
# gross hack
 
118
relink: all
 
119
        $(MAKE) -C hw relink