diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2006-01-06 10:05:58 +0000 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2006-01-06 10:05:58 +0000 |
| commit | 18eb8de66749082e4aa65cc6d369a533826fab33 (patch) | |
| tree | 01e0a4e21b690d3e51f7560ad4d4dcdaff6b38be /qt4 | |
| parent | 93921e77115ebe4d527f98675e438de485e84507 (diff) | |
2006-01-06 Kristian Høgsberg <krh@redhat.com>
* qt/poppler-page.cc:
* qt/poppler-private.h:
* qt/poppler-qt.h:
* qt4/src/Makefile.am:
* qt/Makefile.am:
* poppler/Makefile.am: Move PageTransition to qt bindings, move
contents from Private.h to qt/poppler-private.h.
* poppler/TextOutputDev.cc (visitWord): Remove #warning.
* utils/Makefile.am (pdfimages_SOURCES): Add ImageOutputDev.h, use
dist_man1_MANS so we actually dist the man pages.
* goo/Makefile.am (poppler_goo_include_HEADERS): Add GooVector.h.
* glib/reference/Makefile.am: DOC_SOURCE_DIR must be relative to
$(srcdir), fix this to make distchek run.
* m4/qt.m4:
* m4/libjpeg.m4:
* acinclude.m4:
* configure.ac: Split out Qt and libjpeg checks from configure.ac
and acinclude.m4 to m4/qt.m4 and m4/libjpeg.m4.
Diffstat (limited to 'qt4')
| -rw-r--r-- | qt4/src/Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am index ee9f3e1c..dff866eb 100644 --- a/qt4/src/Makefile.am +++ b/qt4/src/Makefile.am @@ -7,18 +7,20 @@ INCLUDES = \ poppler_includedir = $(includedir)/poppler poppler_include_HEADERS = \ - poppler-qt4.h ../../poppler/PageTransition.h + poppler-qt4.h \ + ../../qt/poppler-page-transition.h -lib_LTLIBRARIES=libpoppler-qt4.la +lib_LTLIBRARIES = libpoppler-qt4.la libpoppler_qt4_la_SOURCES = \ poppler-document.cc \ poppler-page.cc \ poppler-fontinfo.cc \ poppler-textbox.cc \ + ../../qt/poppler-page-transition.cc \ poppler-private.h -libpoppler_qt4_la_LIBADD= \ +libpoppler_qt4_la_LIBADD = \ $(top_builddir)/poppler/libpoppler.la \ $(POPPLER_QT4_LIBS) |