← 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/extmod/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/extmod/Makefile.am
11
11
XV_SRCS = xvmod.c xvmodproc.h
12
12
endif
13
13
 
14
 
AM_CFLAGS = @XORG_CFLAGS@ -DEXTMODULE @SERVER_DEFINES@ @LOADER_DEFINES@
 
14
AM_CFLAGS = @XORG_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@
15
15
INCLUDES = @XORG_INCS@ \
16
16
           -I$(top_srcdir)/afb \
17
17
           -I$(top_srcdir)/mfb \
18
18
           -I$(top_srcdir)/cfb \
19
19
           -I$(top_srcdir)/dbe \
20
20
           -I$(top_srcdir)/hw/xfree86/loader \
21
 
           -I$(top_srcdir)/miext/layer \
22
21
           -I$(top_srcdir)/miext/shadow
23
22
 
24
23
libextmod_la_LDFLAGS = -avoid-version