← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/xfree86/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/xfree86/Makefile.am
6
6
 
7
7
SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
8
8
          ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \
9
 
          xf8_32bpp xf8_32wid loader scanpci dixmods exa \
 
9
          xf8_32bpp loader scanpci dixmods exa \
10
10
          $(DRI_SUBDIR) utils $(DOC_SUBDIR) getconfig
11
11
 
12
12
DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
13
13
               parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \
14
 
               xf8_16bpp xf8_32bpp xf8_32wid loader scanpci dixmods dri exa \
 
14
               xf8_16bpp xf8_32bpp loader scanpci dixmods dri exa \
15
15
               utils doc getconfig
16
16
 
17
17
bin_PROGRAMS = Xorg
21
21
 
22
22
Xorg_SOURCES = xorg.c
23
23
 
24
 
DISTCLEANFILES = xorg.c
 
24
# libxorgos and libcommon need symbols from each other
 
25
noinst_LTLIBRARIES = libosandcommon.la
 
26
libosandcommon_la_SOURCES = osandcommon.c
 
27
libosandcommon_la_LIBADD = \
 
28
            os-support/libxorgos.la \
 
29
            common/libcommon.la
25
30
 
26
 
xorg.c:
 
31
osandcommon.c xorg.c:
27
32
        touch $@
28
33
 
29
 
OS_LIBS = os-support/libxorgos.la
 
34
DISTCLEANFILES = osandcommon.c xorg.c
30
35
 
31
36
XORG_LIBS = \
32
37
            @XORG_CORE_LIBS@ \
33
38
            common/libinit.a \
34
39
            loader/libloader.a \
35
 
            common/libcommon.a \
 
40
            libosandcommon.la \
36
41
            parser/libxf86config.a \
37
 
            $(OS_LIBS) \
38
42
            dummylib/libdummy.a \
39
43
            dixmods/libdixmods.la \
40
44
            @XORG_LIBS@
72
76
dist_options_DATA = Options
73
77
 
74
78
EXTRA_DIST = xorgconf.cpp
 
79
 
 
80
relink:
 
81
        rm -f Xorg && $(MAKE) Xorg