← Back to branch summary

~valavanisalex/ubuntu/oneiric/inkscape/fix-726850

« back to all changes in this revision

Viewing changes to src/libnr/Makefile_insert

  • Committer: Bazaar Package Importer
  • Author(s): Alex Valavanis
  • Date: 2010-09-12 19:44:58 UTC
  • mfrom: (1.1.12 upstream) (45.1.3 maverick)
  • Revision ID: james.westby@ubuntu.com-20100912194458-4sjwmbl7dlsrk5dc
Tags: 0.48.0-1ubuntu1
https://launchpad.net/bugs/628048
https://launchpad.net/bugs/401567
https://launchpad.net/bugs/456248
https://launchpad.net/bugs/463602
https://launchpad.net/bugs/591986
https://launchpad.net/bugs/513319
* Merge with Debian unstable (LP: #628048, LP: #401567, LP: #456248, 
  LP: #463602, LP: #591986)
* debian/control: 
  - Ubuntu maintainers
  - Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
  - Demote pstoedit to Suggests (universe package).
  - Suggests ttf-dejavu instead of ttf-bitstream-vera (LP: #513319)
* debian/rules:
  - Run intltool-update on build (Ubuntu-specific).
  - Add translation domain to .desktop files (Ubuntu-specific).
* debian/dirs:
  - Add usr/share/pixmaps.  Allow inkscape.xpm installation
* drop 50-poppler-API.dpatch (now upstream)
* drop 51-paste-in-unwritable-directory.dpatch (now upstream) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libnr/Makefile_insert
1
1
## Makefile.am fragment sourced by src/Makefile.am.
2
2
 
3
 
if USE_MMX
4
 
libnr_mmx_sources =     \
5
 
        libnr/have_mmx.S        \
6
 
        libnr/nr_mmx_R8G8B8A8_P_EMPTY_A8_RGBAP.S        \
7
 
        libnr/nr_mmx_R8G8B8A8_P_R8G8B8A8_P_A8_RGBAP.S   \
8
 
        libnr/nr_mmx_R8G8B8A8_P_R8G8B8A8_P_R8G8B8A8_N_TRANSFORM.S       \
9
 
        libnr/nr_mmx_R8G8B8_R8G8B8_R8G8B8A8_P.S
10
 
endif
11
 
 
12
3
ink_common_sources +=   \
13
4
        libnr/in-svg-plane.h    \
14
5
        libnr/nr-blit.cpp       \