From e10bf9631652b8533b18a14285db89bd14b4c42e Mon Sep 17 00:00:00 2001 From: rootavish Date: Tue, 1 Jul 2014 20:29:05 +0530 Subject: More changes to accomodate webview - Modified configure.ac to use both webkit2 and webkit1 based on gtk version - Modified Automake file in help/reference/shell/Makefile.am to compile with gtk-doc - Modified ev-document-model to support epub-documents. - Modified ev-window for epub documents. - Modified jobs so epub pages are not rendered. - Modified ev-document, although I'm not sure if this is necessary. Still need to figure out where the web view load uri has to be called to actually load pages, from there the puzzle would be much simpler. Hope to get this done in the week, and pick up the pace now that only six weeks of coding remain before final evaluation. --- help/reference/shell/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'help') diff --git a/help/reference/shell/Makefile.am b/help/reference/shell/Makefile.am index a78201d7..40ece8fc 100644 --- a/help/reference/shell/Makefile.am +++ b/help/reference/shell/Makefile.am @@ -106,6 +106,7 @@ GTKDOC_CFLAGS = \ -DATRIL_COMPILATION \ $(SHELL_CFLAGS) \ $(WARN_CFLAGS) \ + $(WEBKIT_CFLAGS) \ $(DISABLE_DEPRECATED) \ $(GTK_PRINT_CFLAGS) @@ -126,6 +127,7 @@ GTKDOC_LIBS = \ $(top_builddir)/libmisc/libevmisc.la \ $(SHELL_LIBS) \ $(GTK_PRINT_LIBS) \ + $(WEBKIT_LIBS) \ $(filter-out $(FILTER_OUT),$(wildcard $(top_builddir)/shell/*.o)) # This includes the standard gtk-doc make rules, copied by gtkdocize. -- cgit v1.2.1 From 89bf352b3d2725b11328e7641cef5c3cc2a8ea39 Mon Sep 17 00:00:00 2001 From: rootavish Date: Tue, 12 Aug 2014 20:55:35 +0530 Subject: Fixed Makefile to include webkit outside epub I noticed I had forgotten to move the webkit check outside the epub plugin, did so now, accordingly modified the module names. --- help/reference/libview/Makefile.am | 4 +++- help/reference/shell/Makefile.am | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'help') diff --git a/help/reference/libview/Makefile.am b/help/reference/libview/Makefile.am index edbc870e..dce0dcd1 100644 --- a/help/reference/libview/Makefile.am +++ b/help/reference/libview/Makefile.am @@ -110,12 +110,14 @@ GTKDOC_CFLAGS = \ $(AM_CFLAGS) \ $(LIBVIEW_CFLAGS) \ $(WARN_CFLAGS) \ + $(WEBKIT_CFLAGS) \ $(DISABLE_DEPRECATED) GTKDOC_LIBS = \ $(top_builddir)/libdocument/libatrildocument.la \ $(top_builddir)/libview/libatrilview.la \ - $(LIBDOCUMENT_LIBS) + $(LIBDOCUMENT_LIBS) \ + $(WEBKIT_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make diff --git a/help/reference/shell/Makefile.am b/help/reference/shell/Makefile.am index 40ece8fc..a78201d7 100644 --- a/help/reference/shell/Makefile.am +++ b/help/reference/shell/Makefile.am @@ -106,7 +106,6 @@ GTKDOC_CFLAGS = \ -DATRIL_COMPILATION \ $(SHELL_CFLAGS) \ $(WARN_CFLAGS) \ - $(WEBKIT_CFLAGS) \ $(DISABLE_DEPRECATED) \ $(GTK_PRINT_CFLAGS) @@ -127,7 +126,6 @@ GTKDOC_LIBS = \ $(top_builddir)/libmisc/libevmisc.la \ $(SHELL_LIBS) \ $(GTK_PRINT_LIBS) \ - $(WEBKIT_LIBS) \ $(filter-out $(FILTER_OUT),$(wildcard $(top_builddir)/shell/*.o)) # This includes the standard gtk-doc make rules, copied by gtkdocize. -- cgit v1.2.1