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

« back to all changes in this revision

Viewing changes to hw/kdrive/nvidia/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:
 
1
INCLUDES =                                      \
 
2
        @KDRIVE_INCS@                           \
 
3
        -I$(top_srcdir)/hw/kdrive/vesa          \
 
4
        @KDRIVE_CFLAGS@
 
5
 
 
6
bin_PROGRAMS = Xnvidia
 
7
 
 
8
noinst_LIBRARIES = libnvidia.a
 
9
 
 
10
if TSLIB
 
11
TSLIB_FLAG = -lts
 
12
endif
 
13
 
 
14
#       nvidiavideo.c
 
15
 
 
16
libnvidia_a_SOURCES =   \
 
17
        nvidia.c        \
 
18
        nvidiadraw.c    \
 
19
        nvidia.h        \
 
20
        nvidiadraw.h
 
21
 
 
22
Xnvidia_SOURCES = \
 
23
        nvidiastub.c
 
24
 
 
25
NVIDIA_LIBS =                                   \
 
26
        libnvidia.a                             \
 
27
        $(top_builddir)/hw/kdrive/vesa/libvesa.a \
 
28
        @KDRIVE_LIBS@
 
29
 
 
30
Xnvidia_LDADD = \
 
31
        $(NVIDIA_LIBS)                          \
 
32
        @KDRIVE_LIBS@                           \
 
33
        @XSERVER_LIBS@                                  \
 
34
        $(TSLIB_FLAG)
 
35
 
 
36
Xnvidia_DEPENDENCIES = $(NVIDIA_LIBS) @KDRIVE_LIBS@