← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/xgl/glxext/module/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/xgl/glxext/module/Makefile.am
 
1
AM_CFLAGS = \
 
2
        @SERVER_DEFINES@    \
 
3
        -DHAVE_XGL_CONFIG_H \
 
4
        -DHAVE_DIX_CONFIG_H \
 
5
        $(XGLMODULES_CFLAGS) \
 
6
        -I$(top_srcdir)/hw/xgl 
 
7
 
 
8
libglx_la_LDFLAGS = -avoid-version
 
9
libglx_la_SOURCES = glxmodule.c
 
10
libglx_la_LIBADD  = $(top_builddir)/GL/glx/libglx.la
 
11
libglx_modules    = libglx.la
 
12
 
 
13
libglcore_la_LDFLAGS = -avoid-version
 
14
libglcore_la_SOURCES = glcoremodule.c
 
15
libglcore_la_LIBADD  = $(top_builddir)/GL/mesa/libGLcore.la
 
16
libglcore_modules    = libglcore.la
 
17
 
 
18
moduledir = @XGL_MODULE_PATH@
 
19
 
 
20
module_LTLIBRARIES =         \
 
21
        $(libglcore_modules) \
 
22
        $(libglx_modules)