← Back to branch summary

~ubuntu-branches/ubuntu/dapper/poppler/dapper-security

« back to all changes in this revision

Viewing changes to poppler/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2006-03-06 18:42:44 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20060306184244-oomqyiqr7cgncp2c
Tags: 0.5.1-0ubuntu1
* New upstream version:
  - Support for embedded files.
  - Handle 0-width lines correctly.
  - Avoid external file use when opening fonts.
  - Only use vector fonts returned from fontconfig (#5758).
  - Fix scaled 1x1 pixmaps use for drawing lines (#3387).
  - drawSoftMaskedImage support in cairo backend.
  - Misc bug fixes: #5922, #5946, #5749, #5952, #4030, #5420.
* debian/control.in, debian/libpoppler0c2.dirs, 
  debian/libpoppler0c2-glib.dirs, debian/libpoppler0c2-glib.install,
  debian/libpoppler0c2.install, debian/libpoppler0c2-qt.dirs,
  debian/libpoppler0c2-qt.install, debian/rules:
  - updated for the soname change
* debian/patches/000_splash_build_fix.patch:
  - fix build when using splash
* debian/patches/001_fixes_for_fonts_selection.patch:
  - fix with the new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
poppler/Makefile.am
34
34
 
35
35
if BUILD_CAIRO_OUTPUT
36
36
 
37
 
cairo_sources =                                 \
 
37
poppler_cairo = libpoppler-cairo.la
 
38
 
 
39
cairo_includes =                                \
 
40
        $(CAIRO_CFLAGS)
 
41
 
 
42
libpoppler_cairo_la_SOURCES =                   \
38
43
        CairoFontEngine.cc                      \
39
 
        CairoOutputDev.cc
40
 
 
41
 
cairo_headers =                                 \
42
44
        CairoFontEngine.h                       \
 
45
        CairoOutputDev.cc                       \
43
46
        CairoOutputDev.h
44
47
 
45
 
cairo_includes =                                \
46
 
        $(CAIRO_CFLAGS)
47
 
 
48
 
cairo_libs =                                    \
49
 
        $(CAIRO_LIBS)
50
 
 
51
48
endif
52
49
 
53
50
if BUILD_LIBJPEG
82
79
 
83
80
lib_LTLIBRARIES = libpoppler.la
84
81
 
 
82
noinst_LTLIBRARIES = $(poppler_cairo)
 
83
 
85
84
libpoppler_la_LIBADD =                          \
86
85
        $(top_builddir)/goo/libgoo.la           \
87
86
        $(top_builddir)/fofi/libfofi.la         \
88
87
        $(splash_libs)                          \
89
 
        $(cairo_libs)                           \
90
88
        $(arthur_libs)                          \
91
89
        $(libjpeg_libs)                         \
92
90
        $(zlib_libs)                            \
93
91
        $(FREETYPE_LIBS)
94
92
 
 
93
libpoppler_la_LDFLAGS = -version-info 1:0:0
 
94
 
95
95
if ENABLE_XPDF_HEADERS
96
96
 
97
97
poppler_includedir = $(includedir)/poppler
98
98
poppler_include_HEADERS =       \
99
99
        $(splash_headers)       \
100
 
        $(cairo_headers)        \
101
100
        $(arthur_headers)       \
102
101
        Annot.h                 \
103
102
        Array.h                 \
146
145
        PSOutputDev.h           \
147
146
        TextOutputDev.h         \
148
147
        SecurityHandler.h       \
 
148
        UGooString.h            \
149
149
        UTF8.h                  \
150
150
        XpdfPluginAPI.h         \
151
151
        poppler-config.h
199
199
        PageLabelInfo.h         \
200
200
        PageLabelInfo.cc        \
201
201
        SecurityHandler.cc      \
 
202
        UGooString.cc           \
202
203
        XpdfPluginAPI.cc