← Back to branch summary

~ubuntu-branches/ubuntu/quantal/imagemagick/quantal

« back to all changes in this revision

Viewing changes to config/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Muharem Hrnjadovic
  • Date: 2009-06-04 13:01:13 UTC
  • mfrom: (1.1.5 upstream) (6.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20090604130113-my9114jxmafpwew3
Tags: 7:6.5.1.0-1.1ubuntu1
* Merge from debian unstable, remaining changes:
  - (Build-)depend on libltdl7-dev instead of libltdl3-dev (the armel buildds
    currently have both available).
  - Don't build-dep on librsvg, it brings in excessive dependencies

Show diffs side-by-side

added added

removed removed

Lines of Context:
config/Makefile.am
1
 
#  Copyright 1999-2008 ImageMagick Studio LLC, a non-profit organization
 
1
#  Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization
2
2
#  dedicated to making software imaging solutions freely available.
3
3
#
4
4
#  You may not use this file except in compliance with the License.  You may
12
12
#  See the License for the specific language governing permissions and
13
13
#  limitations under the License.
14
14
#
 
15
#  Copyright (C) 2003 - 2008 GraphicsMagick Group
 
16
#
15
17
#  Makefile for Magick ImageMagick configuration files.
16
18
 
17
19
# Where architecture-independent configuration files get installed
37
39
        config/locale.xml \
38
40
        config/type.xml \
39
41
        config/type-ghostscript.xml \
40
 
        config/type-solaris.xml \
41
42
        config/type-windows.xml
42
43
 
43
44
CONFIG_EXTRA_DIST = \
55
56
        config/sRGB.icm \
56
57
        config/thresholds.xml \
57
58
        config/type-ghostscript.xml.in \
58
 
        config/type-solaris.xml.in \
59
59
        config/type-windows.xml.in \
60
60
        config/type.xml.in