← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/poppler/oneiric-security

« back to all changes in this revision

Viewing changes to qt4/src/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2010-08-13 10:58:05 UTC
  • mfrom: (1.1.32 upstream)
  • Revision ID: james.westby@ubuntu.com-20100813105805-v6ybtufexxiska06
Tags: 0.14.2.is.0.14.1-0ubuntu1
* Revert previous upstream update. It bumped SONAME, but the packaging
  wasn't updated along with it, so we now have a broken libpoppler6. Provide
  a fixed one with this reversion until we can do the transition properly.
* debian/control: Update Breaks/Provides: to account for xpdf-utils now
  being a transitional package. Change forward ported from Debian's
  0.12.4-1.1 package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
qt4/src/Makefile.am
51
51
        poppler-private.h                       \
52
52
        poppler-page-transition-private.h
53
53
 
54
 
libpoppler_qt4_la_CXXFLAGS =                    \
55
 
        -Dpoppler_qt4_EXPORTS
56
 
 
57
54
libpoppler_qt4_la_LIBADD =                      \
58
55
        $(top_builddir)/poppler/libpoppler.la   \
59
56
        $(top_builddir)/poppler/libpoppler-arthur.la    \
60
57
        $(FONTCONFIG_LIBS)                              \
61
58
        $(POPPLER_QT4_LIBS)
62
59
 
63
 
libpoppler_qt4_la_LDFLAGS = -version-info 6:0:3 @create_shared_lib@ @auto_import_flags@
 
60
libpoppler_qt4_la_LDFLAGS = -version-info 6:0:3 @create_shared_lib@
64
61
 
65
62
# This rule lets GNU make create any *.moc from the equivalent *.h
66
63
.h.moc:
67
64
        $(AM_V_GEN) $(MOCQT4) -i $< -o $@
68
65
 
69
 
BUILT_SOURCES = poppler-optcontent.moc
 
66
poppler-optcontent.lo: poppler-optcontent.moc
70
67
 
71
68
clean-generic:
72
69
        rm -f *.moc