← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/xgl/glx/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/glx/Makefile.am
 
1
if XGL
 
2
XGL_MODULE_DIRS = module
 
3
endif
 
4
 
 
5
DIST_SUBDIRS = module
 
6
 
 
7
SUBDIRS =                 \
 
8
        .                 \
 
9
        $(XGL_MODULE_DIRS)
 
10
 
 
11
AM_CFLAGS = \
 
12
        -I$(srcdir)/.. \
 
13
        -I$(srcdir)/../glxext \
 
14
        -I$(top_srcdir)/GL/glx \
 
15
        -I$(top_srcdir)/GL/include \
 
16
        -I@MESA_SOURCE@/include \
 
17
        -I@MESA_SOURCE@/src/mesa/glapi \
 
18
        @SERVER_DEFINES@ \
 
19
        -DHAVE_XGL_CONFIG_H \
 
20
        -DHAVE_DIX_CONFIG_H \
 
21
        $(XGLXMODULES_CFLAGS)
 
22
 
 
23
noinst_LTLIBRARIES = libxglx.la
 
24
 
 
25
libxglx_la_SOURCES = \
 
26
        xglx.h       \
 
27
        xglx.c       \
 
28
        xglxorg.c
 
29
 
 
30
# Xglx_DEPENDENCIES = @XGLX_LIBS@
 
31
# Xglx_LDFLAGS    = -export-dynamic
 
32
# Xglx_SOURCES    = \
 
33
#       xglxinit.c \
 
34
#       $(top_srcdir)/mi/miinitext.c \
 
35
#       $(top_srcdir)/Xext/dpmsstubs.c \
 
36
#       $(top_srcdir)/Xi/stubs.c \
 
37
#       $(top_srcdir)/fb/fbcmap.c
 
38
#Xglx_LDADD = \
 
39
#       libxglx.la \
 
40
#       ../libxgl.a \
 
41
#       $(XORG_CORE_LIBS) \
 
42
#       $(XGLX_LIBS) \
 
43
#       $(EXTENSION_LIBS) \
 
44
#       $(XGLXMODULES_LIBS) \
 
45
#       -lXrandr
 
46
#Xglx_programs    = Xglx
 
47
#
 
48
#bin_PROGRAMS = $(Xglx_programs)