~cyphermox/ubuntu/lucid/fontconfig/merge-to-2.8.0-2.lp490326.take2

« back to all changes in this revision

Viewing changes to fc-cat/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2008-06-25 11:08:02 UTC
  • mfrom: (1.1.6 upstream) (0.1.4 lenny)
  • Revision ID: james.westby@ubuntu.com-20080625110802-r4ou6gkwalr9cjzz
Tags: 2.6.0-1ubuntu1
* Merge with Debian; remaining changes:
  - conf.d/40-nonlatin.conf: Add `MgOpen Moderna' to the list of fonts
    for which we might fall back to sans-serif.
  - conf.d/60-latin.conf: Prefer DejaVu over Bitstream Vera,
    as done for dapper.
  - 52-languageselector.conf loads language-selector.conf.
  - Include 52-languageselector.conf in the lists in conf.d/Makefile.am so
    that it actually gets installed and used.  Fixes LP 73714.
  - Some hackery in the debconf config script which attempts to upgrade
    user preferences across the many changes which have occurred to the
    debconf questions.  In particular:
    + Do not attempt to divine enable_bitmaps option by reading the
      symlinks in /etc.  This leaves the only way to permanently change
      the behaviour being dpkg-reconfigure.  The divination code was
      wrong and was intended by Debian to preserve pre-debconf
      configuration.  It would be nicer to preserve handmade updates to
      the /etc directory.
    + Always create /etc/fontconfig/conf.d/ symlink for enabling or
      disabling bitmap fonts.  This records the state from debconf
      unambiguously into the filesystem and will make it possible for
      future upgrades (from Edgy or later) to preserve handmade changes.
  - Add a (optional) include for "language-selector.conf" in fonts.conf
  - debian/patches/03_preferred_symbol_font.patch:
    + prefer "Standard Symbols L" as symbol font (Ubuntu: #37745)
  - Fix incorrect location of /usr/share/X11/fonts.
  - Correctly fix the (eg) firefox vs. (eg) evince font metrics problem:
    + New FC_ANY_METRICS property, boolean.
    + Change URW Nimbus and AMT font aliases in 30-{urw,metric}-aliases.conf
      into equivalent <match> directives so that we can add an additional
      test which disables them when the anymetrics property is true.
  - debian/rules (clean): Clean doc directory.
  - add debian/patches/05_ubuntu_hinting_and_antialias_confs.patch:
    - adds 10-antialias.conf, 10-hinting.conf, 10-hinting-full.conf,
      10-hinting-medium.conf and 10-hinting-slight.conf
  - modified conf.d/Makefile.am and conf.d/Makefile.in so that
    10-antialias.conf, 10-hinting.conf, 10-hinting-medium.conf and 
    10-no-subpixel.conf get linked by default to have te same default
    settings for all Ubuntu flavors. 10-hinting-full.conf and
    10-hinting-slight.conf will go into conf.avail/ .

Show diffs side-by-side

added added

removed removed

Lines of Context:
63
63
subdir = fc-cat
64
64
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
65
65
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
66
 
am__aclocal_m4_deps = $(top_srcdir)/configure.in
 
66
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 
67
        $(top_srcdir)/configure.in
67
68
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
68
69
        $(ACLOCAL_M4)
69
70
mkinstalldirs = $(install_sh) -d
74
75
PROGRAMS = $(bin_PROGRAMS)
75
76
fc_cat_SOURCES = fc-cat.c
76
77
fc_cat_OBJECTS = fc-cat.$(OBJEXT)
77
 
am__DEPENDENCIES_1 =
78
 
fc_cat_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
79
 
        $(am__DEPENDENCIES_1) ${top_builddir}/src/libfontconfig.la
 
78
fc_cat_DEPENDENCIES = ${top_builddir}/src/libfontconfig.la
80
79
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
81
80
depcomp = $(SHELL) $(top_srcdir)/depcomp
82
81
am__depfiles_maybe = depfiles
83
82
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
84
83
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
85
 
LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
86
 
        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
87
 
        $(AM_CFLAGS) $(CFLAGS)
88
84
CCLD = $(CC)
89
85
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
90
86
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
127
123
DOCDIR = @DOCDIR@
128
124
DOCMAN3 = @DOCMAN3@
129
125
DOCSRC = @DOCSRC@
 
126
DOLT_BASH = @DOLT_BASH@
 
127
DSYMUTIL = @DSYMUTIL@
130
128
ECHO = @ECHO@
131
129
ECHO_C = @ECHO_C@
132
130
ECHO_N = @ECHO_N@
160
158
LIBOBJS = @LIBOBJS@
161
159
LIBS = @LIBS@
162
160
LIBTOOL = @LIBTOOL@
 
161
LIBT_CURRENT = @LIBT_CURRENT@
 
162
LIBT_CURRENT_MINUS_AGE = @LIBT_CURRENT_MINUS_AGE@
 
163
LIBT_REVISION = @LIBT_REVISION@
 
164
LIBT_VERSION_INFO = @LIBT_VERSION_INFO@
163
165
LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
164
166
LIBXML2_LIBS = @LIBXML2_LIBS@
165
167
LN_S = @LN_S@
 
168
LTCOMPILE = @LTCOMPILE@
 
169
LTCXXCOMPILE = @LTCXXCOMPILE@
166
170
LTLIBOBJS = @LTLIBOBJS@
167
 
LT_CURRENT = @LT_CURRENT@
168
 
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
169
 
LT_REVISION = @LT_REVISION@
170
 
LT_VERSION_INFO = @LT_VERSION_INFO@
171
171
MAINT = @MAINT@
172
172
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
173
173
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
174
174
MAKEINFO = @MAKEINFO@
175
175
MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@
176
176
MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@
 
177
NMEDIT = @NMEDIT@
177
178
OBJDUMP = @OBJDUMP@
178
179
OBJEXT = @OBJEXT@
179
180
ORTH_FILES = @ORTH_FILES@
250
251
DOC2MAN = docbook2man
251
252
FC_CAT_SRC = ${top_srcdir}/fc-cat
252
253
SGML = ${FC_CAT_SRC}/fc-cat.sgml
253
 
INCLUDES = -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
254
 
man_MANS = fc-cat.1
255
 
EXTRA_DIST = fc-cat.sgml fc-cat.1
256
 
fc_cat_LDADD = $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) ${top_builddir}/src/libfontconfig.la
 
254
INCLUDES = -I${top_srcdir} $(WARN_CFLAGS)
 
255
BUILT_MANS = fc-cat.1
 
256
@ENABLE_DOCS_TRUE@man_MANS = ${BUILT_MANS}
 
257
EXTRA_DIST = fc-cat.sgml ${BUILT_MANS}
 
258
fc_cat_LDADD = ${top_builddir}/src/libfontconfig.la
257
259
all: all-am
258
260
 
259
261
.SUFFIXES: