1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
|
diff -ruN poppler-0.10.0/Makefile.am poppler-0.10.0-bindings/Makefile.am
--- poppler-0.10.0/Makefile.am 2008-09-09 23:46:50.000000000 +0200
+++ poppler-0.10.0-bindings/Makefile.am 2008-11-08 00:03:17.000000000 +0100
@@ -29,7 +29,7 @@
utils_subdir = utils
endif
-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
+SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir)
EXTRA_DIST = \
README-XPDF \
@@ -40,9 +40,6 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \
- poppler.pc \
- $(cairo_pc_file) \
- $(splash_pc_file) \
$(glib_pc_file) \
$(qt_pc_file) \
$(qt4_pc_file)
diff -ruN poppler-0.10.0/glib/Makefile.am poppler-0.10.0-bindings/glib/Makefile.am
--- poppler-0.10.0/glib/Makefile.am 2008-09-27 17:21:45.000000000 +0200
+++ poppler-0.10.0-bindings/glib/Makefile.am 2008-11-08 00:03:17.000000000 +0100
@@ -87,7 +87,7 @@
poppler-private.h
libpoppler_glib_la_LIBADD = \
- $(top_builddir)/poppler/libpoppler.la \
+ -lpoppler \
$(POPPLER_GLIB_LIBS) \
$(GDK_LIBS) \
$(FREETYPE_LIBS) \
@@ -103,7 +103,7 @@
test-poppler-glib.cc
test_poppler_glib_LDADD = \
- $(top_builddir)/poppler/libpoppler.la \
+ -lpoppler \
libpoppler-glib.la \
$(POPPLER_GLIB_LIBS) \
$(GDK_LIBS) \
diff -ruN poppler-0.10.0/glib/demo/Makefile.am poppler-0.10.0-bindings/glib/demo/Makefile.am
--- poppler-0.10.0/glib/demo/Makefile.am 2008-08-24 18:19:55.000000000 +0200
+++ poppler-0.10.0-bindings/glib/demo/Makefile.am 2008-11-08 00:03:17.000000000 +0100
@@ -36,5 +36,5 @@
LDADD = \
$(top_builddir)/glib/libpoppler-glib.la \
- $(top_builddir)/poppler/libpoppler.la \
+ -lpoppler \
$(GTK_TEST_LIBS)
diff -ruN poppler-0.10.0/glib/reference/Makefile.am poppler-0.10.0-bindings/glib/reference/Makefile.am
--- poppler-0.10.0/glib/reference/Makefile.am 2008-07-24 22:45:05.000000000 +0200
+++ poppler-0.10.0-bindings/glib/reference/Makefile.am 2008-11-08 00:03:17.000000000 +0100
@@ -73,7 +73,7 @@
$(GDK_CFLAGS) \
$(FREETYPE_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/poppler/libpoppler.la \
+GTKDOC_LIBS=-lpoppler \
$(top_builddir)/glib/libpoppler-glib.la \
$(POPPLER_GLIB_LIBS) \
$(FREETYPE_LIBS) \
diff -ruN poppler-0.10.0/qt/Makefile.am poppler-0.10.0-bindings/qt/Makefile.am
--- poppler-0.10.0/qt/Makefile.am 2008-07-24 22:45:05.000000000 +0200
+++ poppler-0.10.0-bindings/qt/Makefile.am 2008-11-08 00:03:17.000000000 +0100
@@ -24,7 +24,7 @@
poppler-private.h
libpoppler_qt_la_LIBADD = \
- $(top_builddir)/poppler/libpoppler.la \
+ -lpoppler \
$(POPPLER_QT_LIBS) \
$(FREETYPE_LIBS) \
$(FONTCONFIG_LIBS)
@@ -41,7 +41,7 @@
test-poppler-qt.cpp
test_poppler_qt_LDADD = \
- $(top_builddir)/poppler/libpoppler.la \
+ -lpoppler \
libpoppler-qt.la \
$(POPPLER_QT_LIBS) \
$(FREETYPE_LIBS)
diff -ruN poppler-0.10.0/qt4/demos/Makefile.am poppler-0.10.0-bindings/qt4/demos/Makefile.am
--- poppler-0.10.0/qt4/demos/Makefile.am 2008-07-24 22:45:06.000000000 +0200
+++ poppler-0.10.0-bindings/qt4/demos/Makefile.am 2008-11-08 00:05:09.000000000 +0100
@@ -7,7 +7,7 @@
$(POPPLER_QT4_CFLAGS)
LDADDS = \
- $(top_builddir)/poppler/libpoppler.la \
+ -lpoppler \
$(top_builddir)/qt4/src/libpoppler-qt4.la \
$(FONTCONFIG_LIBS) \
$(POPPLER_QT4_LIBS)
diff -ruN poppler-0.10.0/qt4/src/Makefile.am poppler-0.10.0-bindings/qt4/src/Makefile.am
--- poppler-0.10.0/qt4/src/Makefile.am 2008-09-10 00:02:49.000000000 +0200
+++ poppler-0.10.0-bindings/qt4/src/Makefile.am 2008-11-08 00:03:17.000000000 +0100
@@ -52,7 +52,7 @@
poppler-private.h
libpoppler_qt4_la_LIBADD = \
- $(top_builddir)/poppler/libpoppler.la \
+ -lpoppler \
$(FONTCONFIG_LIBS) \
$(POPPLER_QT4_LIBS)
diff -ruN poppler-0.10.0/qt4/tests/Makefile.am poppler-0.10.0-bindings/qt4/tests/Makefile.am
--- poppler-0.10.0/qt4/tests/Makefile.am 2008-09-05 18:41:33.000000000 +0200
+++ poppler-0.10.0-bindings/qt4/tests/Makefile.am 2008-11-08 00:03:17.000000000 +0100
@@ -7,7 +7,7 @@
$(POPPLER_QT4_CFLAGS)
LDADDS = \
- $(top_builddir)/poppler/libpoppler.la \
+ -lpoppler \
$(top_builddir)/qt4/src/libpoppler-qt4.la \
$(FONTCONFIG_LIBS) \
$(POPPLER_QT4_LIBS)
diff -ruN poppler-0.10.0/test/Makefile.am poppler-0.10.0-bindings/test/Makefile.am
--- poppler-0.10.0/test/Makefile.am 2008-10-06 19:35:46.000000000 +0200
+++ poppler-0.10.0-bindings/test/Makefile.am 2008-11-08 00:05:42.000000000 +0100
@@ -51,14 +51,14 @@
gtk-splash-test.cc
gtk_splash_test_LDADD = \
- $(top_builddir)/poppler/libpoppler.la \
+ -lpoppler \
$(GTK_TEST_LIBS)
gtk_cairo_test_SOURCES = \
gtk-cairo-test.cc
gtk_cairo_test_LDADD = \
- $(top_builddir)/poppler/libpoppler.la \
+ -lpoppler \
$(top_builddir)/glib/libpoppler-glib.la \
$(CAIRO_LIBS) \
$(GTK_TEST_LIBS) \
@@ -69,7 +69,7 @@
pdf_inspector_LDADD = \
$(top_builddir)/poppler/libpoppler-cairo.la \
- $(top_builddir)/poppler/libpoppler.la \
+ -lpoppler \
$(CAIRO_LIBS) \
$(FREETYPE_LIBS) \
$(GTK_TEST_LIBS) \
@@ -80,7 +80,7 @@
perf-test-preview-dummy.cc
perf_test_LDADD = \
- $(top_builddir)/poppler/libpoppler.la \
+ -lpoppler \
$(FREETYPE_LIBS) \
$(X_EXTRA_LIBS)
@@ -88,7 +88,7 @@
pdf-fullrewrite.cc
pdf_fullrewrite_LDADD = \
- $(top_builddir)/poppler/libpoppler.la
+ -lpoppler
EXTRA_DIST = \
pdf-operators.c \
diff -ruN poppler-0.10.0/utils/Makefile.am poppler-0.10.0-bindings/utils/Makefile.am
--- poppler-0.10.0/utils/Makefile.am 2008-09-09 20:55:24.000000000 +0200
+++ poppler-0.10.0-bindings/utils/Makefile.am 2008-11-08 00:03:17.000000000 +0100
@@ -29,7 +29,7 @@
$(ABIWORD_CFLAGS)
LDADD = \
- $(top_builddir)/poppler/libpoppler.la \
+ -lpoppler \
$(UTILS_LIBS) \
$(FONTCONFIG_LIBS)
|
