← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/kdrive/neomagic/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/neomagic/Makefile.am
 
1
if KDRIVEFBDEV
 
2
FBDEV_INCLUDES =-I$(top_srcdir)/hw/kdrive/fbdev
 
3
FBDEV_LIBS = $(top_builddir)/hw/kdrive/fbdev/libfbdev.a
 
4
endif
 
5
 
 
6
if KDRIVEVESA
 
7
VESA_INCLUDES = -I$(top_srcdir)/hw/kdrive/vesa
 
8
VESA_LIBS = $(top_builddir)/hw/kdrive/vesa/libvesa.a
 
9
endif
 
10
 
 
11
INCLUDES =                      \
 
12
        @KDRIVE_INCS@               \
 
13
        $(FBDEV_INCLUDES)           \
 
14
        $(VESA_INCLUDES)            \
 
15
        @KDRIVE_CFLAGS@
 
16
 
 
17
bin_PROGRAMS = Xneomagic
 
18
 
 
19
if TSLIB
 
20
TSLIB_FLAG = -lts
 
21
endif
 
22
 
 
23
noinst_LIBRARIES = libneomagic.a
 
24
 
 
25
libneomagic_a_SOURCES =         \
 
26
        backend.h                   \
 
27
        backend.c                   \
 
28
        neomagic.c                  \
 
29
        neomagic.h                  \
 
30
        neo_draw.c
 
31
 
 
32
Xneomagic_SOURCES = \
 
33
        neomagicstub.c
 
34
 
 
35
NEOMAGIC_LIBS =                 \
 
36
        libneomagic.a               \
 
37
        ${FBDEV_LIBS}               \
 
38
        ${VESA_LIBS}                \
 
39
        @KDRIVE_LIBS@
 
40
 
 
41
Xneomagic_LDADD = \
 
42
        $(NEOMAGIC_LIBS)            \
 
43
        @KDRIVE_LIBS@               \
 
44
        @XSERVER_LIBS@                                  \
 
45
        $(TSLIB_FLAG)
 
46
 
 
47
Xneomagic_DEPENDENCIES = $(NEOMAGIC_LIBS) @KDRIVE_LIBS@