Contents of /trunk/poppler/patches/poppler-0.6.4-bindings.patch
Parent Directory
| 
Revision Log
Revision 491 -
(show annotations)
(download)
Fri Feb 15 14:16:22 2008 UTC (16 years, 2 months ago) by niro
File size: 2805 byte(s)
Fri Feb 15 14:16:22 2008 UTC (16 years, 2 months ago) by niro
File size: 2805 byte(s)
-re-diffed against poppler-0.6.4
| 1 | diff -Naur poppler-0.6.4/glib/Makefile.am poppler-0.6.4-magellan/glib/Makefile.am |
| 2 | --- poppler-0.6.4/glib/Makefile.am 2008-01-21 20:59:14.000000000 +0100 |
| 3 | +++ poppler-0.6.4-magellan/glib/Makefile.am 2008-02-15 15:13:55.000000000 +0100 |
| 4 | @@ -4,7 +4,7 @@ |
| 5 | $(CAIRO_CFLAGS) |
| 6 | |
| 7 | cairo_libs = \ |
| 8 | - $(top_builddir)/poppler/libpoppler-cairo.la \ |
| 9 | + -lpoppler \ |
| 10 | $(CAIRO_LIBS) |
| 11 | |
| 12 | endif |
| 13 | @@ -98,7 +98,7 @@ |
| 14 | test-poppler-glib.cc |
| 15 | |
| 16 | test_poppler_glib_LDADD = \ |
| 17 | - $(top_builddir)/poppler/libpoppler.la \ |
| 18 | + -lpoppler \ |
| 19 | libpoppler-glib.la \ |
| 20 | $(POPPLER_GLIB_LIBS) \ |
| 21 | $(FREETYPE_LIBS) \ |
| 22 | diff -Naur poppler-0.6.4/Makefile.am poppler-0.6.4-magellan/Makefile.am |
| 23 | --- poppler-0.6.4/Makefile.am 2008-01-21 20:59:14.000000000 +0100 |
| 24 | +++ poppler-0.6.4-magellan/Makefile.am 2008-02-15 15:15:08.000000000 +0100 |
| 25 | @@ -29,7 +29,7 @@ |
| 26 | utils_subdir = utils |
| 27 | endif |
| 28 | |
| 29 | -SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir) |
| 30 | +SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir) |
| 31 | |
| 32 | EXTRA_DIST = \ |
| 33 | README-XPDF \ |
| 34 | @@ -40,9 +40,7 @@ |
| 35 | |
| 36 | pkgconfigdir = $(libdir)/pkgconfig |
| 37 | pkgconfig_DATA = \ |
| 38 | - poppler.pc \ |
| 39 | $(cairo_pc_file) \ |
| 40 | - $(splash_pc_file) \ |
| 41 | $(glib_pc_file) \ |
| 42 | $(qt_pc_file) \ |
| 43 | $(qt4_pc_file) |
| 44 | diff -Naur poppler-0.6.4/qt/Makefile.am poppler-0.6.4-magellan/qt/Makefile.am |
| 45 | --- poppler-0.6.4/qt/Makefile.am 2008-01-21 20:59:14.000000000 +0100 |
| 46 | +++ poppler-0.6.4-magellan/qt/Makefile.am 2008-02-15 15:16:08.000000000 +0100 |
| 47 | @@ -24,7 +24,7 @@ |
| 48 | poppler-private.h |
| 49 | |
| 50 | libpoppler_qt_la_LIBADD = \ |
| 51 | - $(top_builddir)/poppler/libpoppler.la \ |
| 52 | + -lpoppler \ |
| 53 | $(POPPLER_QT_LIBS) \ |
| 54 | $(FREETYPE_LIBS) \ |
| 55 | $(FONTCONFIG_LIBS) |
| 56 | @@ -41,7 +41,7 @@ |
| 57 | test-poppler-qt.cpp |
| 58 | |
| 59 | test_poppler_qt_LDADD = \ |
| 60 | - $(top_builddir)/poppler/libpoppler.la \ |
| 61 | + -lpoppler \ |
| 62 | libpoppler-qt.la \ |
| 63 | $(POPPLER_QT_LIBS) \ |
| 64 | $(FREETYPE_LIBS) |
| 65 | diff -Naur poppler-0.6.4/qt4/src/Makefile.am poppler-0.6.4-magellan/qt4/src/Makefile.am |
| 66 | --- poppler-0.6.4/qt4/src/Makefile.am 2008-01-21 20:59:14.000000000 +0100 |
| 67 | +++ poppler-0.6.4-magellan/qt4/src/Makefile.am 2008-02-15 15:17:20.000000000 +0100 |
| 68 | @@ -36,7 +36,7 @@ |
| 69 | poppler-private.h |
| 70 | |
| 71 | libpoppler_qt4_la_LIBADD = \ |
| 72 | - $(top_builddir)/poppler/libpoppler.la \ |
| 73 | + -lpoppler \ |
| 74 | $(FONTCONFIG_LIBS) \ |
| 75 | $(POPPLER_QT4_LIBS) |
| 76 | |
| 77 | diff -Naur poppler-0.6.4/qt4/tests/Makefile.am poppler-0.6.4-magellan/qt4/tests/Makefile.am |
| 78 | --- poppler-0.6.4/qt4/tests/Makefile.am 2008-01-21 21:00:59.000000000 +0100 |
| 79 | +++ poppler-0.6.4-magellan/qt4/tests/Makefile.am 2008-02-15 15:17:42.000000000 +0100 |
| 80 | @@ -7,7 +7,7 @@ |
| 81 | $(POPPLER_QT4_CFLAGS) |
| 82 | |
| 83 | LDADDS = \ |
| 84 | - $(top_builddir)/poppler/libpoppler.la \ |
| 85 | + -lpoppler \ |
| 86 | $(top_builddir)/qt4/src/libpoppler-qt4.la \ |
| 87 | $(FONTCONFIG_LIBS) \ |
| 88 | $(POPPLER_QT4_LIBS) |