← Back to branch summary

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

« back to all changes in this revision

Viewing changes to GL/mesa/swrast/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:
GL/mesa/swrast/Makefile.am
1
1
noinst_LTLIBRARIES = libswrast.la
2
2
 
3
 
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
 
3
AM_CFLAGS = \
 
4
        $(DIX_CFLAGS) \
 
5
        @SERVER_DEFINES@ \
 
6
        @MODULE_DEFINES@ \
 
7
        @LOADER_DEFINES@ \
 
8
        @GLX_DEFINES@
4
9
 
5
10
INCLUDES = -I@MESA_SOURCE@/include \
6
11
           -I../X \
9
14
           -I../main \
10
15
           -I../math \
11
16
           -I../shader \
 
17
           -I../shader/slang \
 
18
           -I../shader/slang \
12
19
           -I../swrast \
13
20
           -I../swrast_setup \
14
21
           -I../tnl \
19
26
                      s_aatriangle.c \
20
27
                      s_accum.c \
21
28
                      s_alpha.c \
 
29
                      s_arbshader.c \
22
30
                      s_atifragshader.c \
23
31
                      s_bitmap.c \
24
32
                      s_blend.c \
 
33
                      s_blit.c \
25
34
                      s_buffers.c \
26
35
                      s_context.c \
27
36
                      s_copypix.c \
29
38
                      s_drawpix.c \
30
39
                      s_feedback.c \
31
40
                      s_fog.c \
32
 
                      s_fragprog_to_c.c \
33
41
                      s_imaging.c \
34
42
                      s_lines.c \
35
43
                      s_logic.c \
36
44
                      s_masking.c \
37
45
                      s_nvfragprog.c \
38
 
                      s_pixeltex.c \
39
46
                      s_points.c \
40
47
                      s_readpix.c \
41
48
                      s_span.c \
42
49
                      s_stencil.c \
43
 
                      s_tcc.c \
 
50
                      s_texcombine.c \
 
51
                      s_texfilter.c \
44
52
                      s_texstore.c \
45
 
                      s_texture.c \
46
53
                      s_triangle.c \
47
54
                      s_zoom.c