diff options
| author | rootavish <[email protected]> | 2014-06-19 14:19:48 +0530 |
|---|---|---|
| committer | rootavish <[email protected]> | 2014-06-19 14:19:48 +0530 |
| commit | d57fa16e9e8c9091ebf826af94a0c3ad1a593596 (patch) | |
| tree | 3969514d475a92c977fa15ee7e19ac37d5fe3575 | |
| parent | 3fd3e5708b0566b1392fa5e7f37a18de137a43e0 (diff) | |
| download | atril-d57fa16e9e8c9091ebf826af94a0c3ad1a593596.tar.bz2 atril-d57fa16e9e8c9091ebf826af94a0c3ad1a593596.tar.xz | |
Epub backend builds as a part of Atril compilation
Fixed a tabbing error in backend/Makefile.am due to which the epub backend was not a target when building recursilvely, i am not commiting the changes to
epub-document.c as currently it will break the build, hope to fix it and get webkit and mathjax done by the weekend.
Also fixed an error in configure.ac wherin the appearance of AM_LIBTOOL_PROG before AC_CXX_PROG caused a "link:unsupported hardcode properties error" on Linux Mint.
| -rw-r--r-- | backend/Makefile.am | 8 | ||||
| -rw-r--r-- | backend/epub/Makefile.am | 2 | ||||
| -rw-r--r-- | backend/epub/epub-document.h | 4 | ||||
| -rw-r--r-- | configure.ac | 6 |
4 files changed, 11 insertions, 9 deletions
diff --git a/backend/Makefile.am b/backend/Makefile.am index 1c042067..49bfdf6a 100644 --- a/backend/Makefile.am +++ b/backend/Makefile.am @@ -6,6 +6,10 @@ if ENABLE_PDF SUBDIRS += pdf endif +if ENABLE_EPUB +SUBDIRS += epub +endif + if ENABLE_PS SUBDIRS += ps endif @@ -34,10 +38,6 @@ if ENABLE_XPS SUBDIRS += xps endif -if ENABLE_EPUB - SUBDIRS += epub -endif - EXTRA_DIST = \ backend.symbols diff --git a/backend/epub/Makefile.am b/backend/epub/Makefile.am index a40f5ff1..31dd455e 100644 --- a/backend/epub/Makefile.am +++ b/backend/epub/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = minizip + AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/libdocument \ diff --git a/backend/epub/epub-document.h b/backend/epub/epub-document.h index db9c99e5..c9fd760d 100644 --- a/backend/epub/epub-document.h +++ b/backend/epub/epub-document.h @@ -6,10 +6,10 @@ G_BEGIN_DECLS #define EPUB_TYPE_DOCUMENT (epub_document_get_type ()) -#define EPUB_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPUB_TYPE_DOCUMENT, ePubDocument)) +#define EPUB_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPUB_TYPE_DOCUMENT, EpubDocument)) #define EPUB_IS_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPUB_TYPE_DOCUMENT)) -typedef struct _ePubDocument ePubDocument; +typedef struct _EpubDocument EpubDocument; GType epub_document_get_type (void) G_GNUC_CONST; diff --git a/configure.ac b/configure.ac index e4365af8..19bc4ba4 100644 --- a/configure.ac +++ b/configure.ac @@ -53,14 +53,14 @@ AM_MAINTAINER_MODE([enable]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AM_PROG_LIBTOOL + AC_ISC_POSIX AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CXX AC_STDC_HEADERS - +AM_PROG_LIBTOOL AC_PROG_SED AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums]) @@ -693,7 +693,7 @@ dnl ================== EPUB checks ============================================= dnl TODO : complete this once library dependencies are added and finalized AC_ARG_ENABLE(epub, [AS_HELP_STRING([--enable-epub], - [Compile with support for ePub documents.])], + [Compile with support for epub documents.])], [enable_epub=$enableval], [enable_epub=yes]) |