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