← Back to branch summary

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

« back to all changes in this revision

Viewing changes to Xext/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:
Xext/Makefile.am
4
4
#                    Xorg by default
5
5
# libXextmodule.la:  includes those extensions that are built into a module
6
6
#                    that Xorg loads
 
7
if XORG
7
8
noinst_LTLIBRARIES = libXext.la libXextbuiltin.la libXextmodule.la
 
9
else
 
10
noinst_LTLIBRARIES = libXext.la
 
11
endif
8
12
 
9
 
INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod -I$(top_srcdir)/hw/xfree86/os-support
 
13
INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
10
14
 
11
15
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
12
16
 
 
17
if XORG
13
18
sdk_HEADERS = xvdix.h xvmcext.h
 
19
endif
14
20
 
15
21
# Sources always included in libXextbuiltin.la & libXext.la
16
22
BUILTIN_SRCS =                  \
20
26
        xtest.c                 \
21
27
        xtest1di.c              \
22
28
        xtest1dd.c              \
23
 
        xtest1dd.h              \
24
 
        xf86bigfont.c
 
29
        xtest1dd.h
25
30
 
26
31
# Sources always included in libXextmodule.la & libXext.la
27
32
MODULE_SRCS =                   \
29
34
        mitmisc.c               \
30
35
        shape.c                 \
31
36
        sync.c                  \
32
 
        xcmisc.c                \
33
 
        dpms.c                  \
34
 
        dpmsproc.h
 
37
        xcmisc.c
35
38
 
36
39
# Optional sources included if extension enabled by configure.ac rules
37
40
 
38
41
# MIT Shared Memory extension
39
 
MITSHM_SRCS = shm.c
 
42
MITSHM_SRCS = shm.c shmint.h
40
43
if MITSHM
41
44
BUILTIN_SRCS += $(MITSHM_SRCS)
42
45
endif
121
124
MODULE_SRCS  += $(FONTCACHE_SRCS)
122
125
endif
123
126
 
 
127
# XF86 Big Font extension
 
128
BIGFONT_SRCS = xf86bigfont.c
 
129
if XF86BIGFONT
 
130
BUILTIN_SRCS += $(BIGFONT_SRCS)
 
131
endif
 
132
 
 
133
# DPMS extension
 
134
DPMS_SRCS = dpms.c dpmsproc.h
 
135
if DPMSExtension
 
136
MODULE_SRCS += $(DPMS_SRCS)
 
137
endif
 
138
 
124
139
# Now take all of the above, mix well, bake for 10 minutes and get libXext*.la
125
140
 
126
141
libXext_la_SOURCES =            $(BUILTIN_SRCS) $(MODULE_SRCS)
127
142
 
 
143
if XORG
128
144
libXextbuiltin_la_SOURCES =     $(BUILTIN_SRCS)
129
145
 
130
146
libXextmodule_la_SOURCES =      $(MODULE_SRCS)
131
 
libXextmodule_la_CFLAGS =       $(AM_CFLAGS) @MODULE_DEFINES@ -DEXTMODULE
 
147
endif
132
148
 
133
149
EXTRA_DIST = \
134
150
        README.xtest1-ddx \
146
162
        $(EVI_SRCS) \
147
163
        $(MULTIBUFFER_SRCS) \
148
164
        $(EXTRA_MULTIBUFFER_SRCS) \
149
 
        $(FONTCACHE_SRCS)
 
165
        $(FONTCACHE_SRCS) \
 
166
        $(BIGFONT_SRCS) \
 
167
        $(DPMS_SRCS)
150
168