← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/xfree86/dixmods/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:
hw/xfree86/dixmods/Makefile.am
10
10
XTRAPMOD = libxtrap.la
11
11
endif
12
12
 
13
 
# cfb24 is only used by xf8_32wid, which is only used by sunffb on SPARC
14
 
if BUILD_XF8_32WID
15
 
CFB24MOD = libcfb24.la
16
 
endif
17
 
 
18
13
module_LTLIBRARIES = libafb.la \
19
14
                     libcfb.la \
20
15
                     libcfb16.la \
21
 
                     $(CFB24MOD) \
22
16
                     libcfb32.la \
23
17
                     libfb.la \
24
 
                     liblayer.la \
25
18
                     libmfb.la \
26
19
                     libshadow.la
27
20
 
43
36
           -I$(top_srcdir)/mfb \
44
37
           -I$(top_srcdir)/dbe \
45
38
           -I$(top_srcdir)/hw/xfree86/loader \
46
 
           -I$(top_srcdir)/miext/layer \
47
 
           -I$(top_srcdir)/miext/shadow
 
39
           -I$(top_srcdir)/miext/shadow \
 
40
           -I$(top_srcdir)/GL/glx
48
41
 
49
42
libGLcore_la_LDFLAGS = -avoid-version
50
43
libGLcore_la_LIBADD = $(top_builddir)/GL/mesa/libGLcore.la
67
60
libcfb16_la_LIBADD = $(top_builddir)/cfb16/libcfb16.la
68
61
libcfb16_la_SOURCES = cfb16module.c
69
62
 
70
 
libcfb24_la_LDFLAGS = -avoid-version
71
 
libcfb24_la_LIBADD = $(top_builddir)/cfb24/libcfb24.la
72
 
libcfb24_la_SOURCES = cfb24module.c
73
 
 
74
63
libcfb32_la_LDFLAGS = -avoid-version
75
64
libcfb32_la_LIBADD = $(top_builddir)/cfb32/libcfb32.la
76
65
libcfb32_la_SOURCES = cfb32module.c
77
66
 
78
67
libdbe_la_LDFLAGS = -avoid-version
79
 
libdbe_la_LIBADD = $(top_builddir)/dbe/libdbemodule.la
 
68
libdbe_la_LIBADD = $(top_builddir)/dbe/libdbe.la
80
69
libdbe_la_SOURCES = dbemodule.c
81
70
 
82
71
libfb_la_LDFLAGS = -avoid-version
84
73
libfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c
85
74
 
86
75
libglx_la_LDFLAGS = -avoid-version
87
 
libglx_la_LIBADD = $(top_builddir)/GL/glx/libglx.la
 
76
if AIGLX
 
77
GLXDRI_LIBRARY = $(top_builddir)/GL/glx/libglxdri.la
 
78
endif
 
79
libglx_la_LIBADD = \
 
80
        $(top_builddir)/GL/glx/libglx.la \
 
81
        $(GLXDRI_LIBRARY)
88
82
libglx_la_SOURCES = glxmodule.c
89
83
 
90
 
liblayer_la_LDFLAGS = -avoid-version
91
 
liblayer_la_LIBADD = $(top_builddir)/miext/layer/liblayer.la
92
 
liblayer_la_SOURCES = laymodule.c
93
 
 
94
84
libmfb_la_LDFLAGS = -avoid-version
95
85
libmfb_la_LIBADD = $(top_builddir)/mfb/libmfb.la
96
86
libmfb_la_SOURCES = mfbmodule.c
97
87
 
98
88
librecord_la_LDFLAGS = -avoid-version
99
 
librecord_la_LIBADD = $(top_builddir)/record/librecordmodule.la
 
89
librecord_la_LIBADD = $(top_builddir)/record/librecord.la
100
90
librecord_la_SOURCES = recordmod.c
101
91
 
102
92
libshadow_la_LDFLAGS = -avoid-version
114
104
libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
115
105
 
116
106
libxtrap_la_LDFLAGS = -avoid-version
117
 
libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrapmodule.la
 
107
libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrap.la
118
108
libxtrap_la_SOURCES = xf86XTrapModule.c
119
 
 
120
 
xkb%.c:
121
 
        echo "#define XF86DDXACTIONS" > $@
122
 
        echo "#include \"$(top_srcdir)/xkb/ddx$*.c\"" >> $@