Package: evince-hwp / 0.1.1-2

libghwp-noinst-shlib.patch Patch series | download
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
noinst shlib

diff --git a/configure.ac b/configure.ac
index ef85dc0..6b2a399 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ m4_pattern_allow([AM_V_GEN]) dnl Make autoconf not complain about the rule below
 EV_INTLTOOL_EVINCE_BACKEND_RULE='%.evince-backend:   %.evince-backend.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
 AC_SUBST([EV_INTLTOOL_EVINCE_BACKEND_RULE])
 
-PKG_CHECK_MODULES(EVINCE_HWP, [ghwp-0.2 evince-document-3.0])
+PKG_CHECK_MODULES(EVINCE_HWP, [libgsf-1 cairo evince-document-3.0])
 
 AC_SUBST([backenddir], "/usr/lib/evince/4/backends")
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 8edfbc0..155698a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,11 +12,13 @@ libhwpdocument_la_CPPFLAGS =               \
 
 libhwpdocument_la_CFLAGS = \
 	-Wall                  \
+	-I$(top_srcdir)/libghwp/src \
 	$(EVINCE_HWP_CFLAGS)   \
 	$(AM_CFLAGS)
 
 libhwpdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libhwpdocument_la_LIBADD = $(EVINCE_HWP_LIBS)
+libhwpdocument_la_LIBADD += $(top_srcdir)/libghwp/src/libghwp.la
 
 backend_in_files = hwpdocument.evince-backend.in
 backend_DATA = $(backend_in_files:.evince-backend.in=.evince-backend)
diff --git a/src/hwp-document.c b/src/hwp-document.c
index 873dd03..4586aec 100644
--- a/src/hwp-document.c
+++ b/src/hwp-document.c
@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include <glib/gi18n-lib.h>
-#include <ghwp/ghwp.h>
+#include <ghwp.h>
 
 #include "hwp-document.h"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 32359ef..9b43849 100644
--- a/libghwp/src/Makefile.am
+++ b/libghwp/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-lib_LTLIBRARIES = libghwp.la
+noinst_LTLIBRARIES = libghwp.la
 
 NOINST_H_FILES =