← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/kdrive/pm2/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/kdrive/pm2/Makefile.am
 
1
INCLUDES =                                      \
 
2
        @KDRIVE_INCS@                           \
 
3
        -I$(top_srcdir)/hw/kdrive/vesa          \
 
4
        @KDRIVE_CFLAGS@
 
5
 
 
6
bin_PROGRAMS = Xpm2
 
7
 
 
8
if TSLIB
 
9
TSLIB_FLAG = -lts
 
10
endif
 
11
 
 
12
noinst_LIBRARIES = libpm2.a
 
13
 
 
14
libpm2_a_SOURCES =      \
 
15
        glint_regs.h    \
 
16
        pm2.c           \
 
17
        pm2_draw.c      \
 
18
        pm2.h   
 
19
 
 
20
Xpm2_SOURCES = \
 
21
        pm2stub.c
 
22
 
 
23
PM2_LIBS =                                      \
 
24
        libpm2.a                                \
 
25
        $(top_builddir)/hw/kdrive/vesa/libvesa.a \
 
26
        @KDRIVE_LIBS@
 
27
 
 
28
Xpm2_LDADD = \
 
29
        $(PM2_LIBS)                             \
 
30
        @KDRIVE_LIBS@                          \
 
31
        @XSERVER_LIBS@                                  \
 
32
        $(TSLIB_FLAG)
 
33
 
 
34
Xpm2_DEPENDENCIES = $(PM2_LIBS) @KDRIVE_LIBS@