← Back to branch summary

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

« back to all changes in this revision

Viewing changes to Xprint/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:
Xprint/Makefile.am
1
 
SUBDIRS = doc pcl raster ps etc
 
1
SUBDIRS = doc pcl pcl-mono raster ps etc
2
2
 
3
3
bin_PROGRAMS = Xprt
4
4
 
5
5
Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
6
 
        -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
7
 
        -DXPRINTDIR=\"$(prefix)/X11/xserver\"  
 
6
        -DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
 
7
        -DXPRINTDIR=\"$(libdir)/X11/xserver\"    \
 
8
        -DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
8
9
 
9
10
Xprt_LDFLAGS = -L$(top_srcdir)
10
 
Xprt_LDADD = @XPRINT_LIBS@ pcl/libpcl.la raster/libraster.la
 
11
Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la  \
 
12
        pcl/libpcl.la pcl-mono/libpcl.la  \
 
13
        ../mfb/libmfb.la ../mi/libmi.la  \
 
14
        ../cfb32/libcfb32.la ../cfb/libcfb.la ../Xext/libXext.la \
 
15
        @FREETYPE_LIBS@
11
16
 
12
17
miinitext-wrapper.c:
13
18
        echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@