[epiphany] Use nonrecursive Automake for src/bookmarks

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 1e009e8d54a2d1714b07d7269a114e04ce5bbe3f
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat Oct 8 15:10:22 2016 -0500

    Use nonrecursive Automake for src/bookmarks
    
    It's become too complicated to maintain this with sublibraries

 configure.ac                                  |    1 -
 src/Makefile.am                               |   28 +++++--
 src/bookmarks/Makefile.am                     |  111 -------------------------
 src/bookmarks/ephy-bookmark-properties-grid.c |    2 +-
 4 files changed, 22 insertions(+), 120 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 63518a6..d3ff6f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,7 +212,6 @@ lib/widgets/Makefile
 embed/Makefile
 embed/web-extension/Makefile
 src/Makefile
-src/bookmarks/Makefile
 src/profile-migrator/Makefile
 src/search-provider/Makefile
 po/Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 1be6894..a80858d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = bookmarks . search-provider profile-migrator
+SUBDIRS = . search-provider profile-migrator
 
 pkglib_LTLIBRARIES = libephymain.la
 
@@ -9,9 +9,10 @@ dist_noinst_DATA = \
        $(RESOURCE_FILES)
 
 TYPES_H_FILES = \
-       ephy-link.h                             \
-       ephy-session.h                          \
-       ephy-shell.h                            \
+       bookmarks/ephy-bookmark-properties-grid.h       \
+       ephy-link.h                                     \
+       ephy-session.h                                  \
+       ephy-shell.h                                    \
        ephy-window.h
 
 libephymain_la_SOURCES = \
@@ -21,6 +22,18 @@ libephymain_la_SOURCES = \
        cookies-dialog.h                        \
        ephy-action-helper.c                    \
        ephy-action-helper.h                    \
+       bookmarks/ephy-add-bookmark-popover.c   \
+       bookmarks/ephy-add-bookmark-popover.h   \
+       bookmarks/ephy-bookmark.c               \
+       bookmarks/ephy-bookmark.h               \
+       bookmarks/ephy-bookmark-properties-grid.c       \
+       bookmarks/ephy-bookmark-properties-grid.h       \
+       bookmarks/ephy-bookmark-row.c           \
+       bookmarks/ephy-bookmark-row.h           \
+       bookmarks/ephy-bookmarks-manager.c      \
+       bookmarks/ephy-bookmarks-manager.h      \
+       bookmarks/ephy-bookmarks-popover.c      \
+       bookmarks/ephy-bookmarks-popover.h      \
        ephy-completion-model.c                 \
        ephy-completion-model.h                 \
        ephy-encoding-dialog.c                  \
@@ -71,13 +84,13 @@ libephymain_la_CPPFLAGS = \
        -I$(top_builddir)/embed         \
        -I$(top_builddir)/lib           \
        -I$(top_builddir)/lib/widgets   \
-       -I$(top_srcdir)/src/bookmarks   \
        -I$(top_srcdir)/embed           \
+       -I$(top_srcdir)/gvdb/gvdb       \
        -I$(top_srcdir)/lib             \
        -I$(top_srcdir)/lib/egg         \
        -I$(top_srcdir)/lib/history     \
        -I$(top_srcdir)/lib/widgets     \
-       -I$(top_srcdir)/gvdb            \
+       -I$(top_srcdir)/src/bookmarks   \
        -DLOCALEDIR=\"$(localedir)\"    \
        -DPKGDATADIR=\"$(pkgdatadir)\"  \
        $(GDK_CFLAGS)                   \
@@ -98,10 +111,11 @@ libephymain_la_LDFLAGS = \
        $(WARN_LDFLAGS) -avoid-version -no-undefined
 
 libephymain_la_LIBADD = \
-       $(top_builddir)/src/bookmarks/libephybookmarks.la       \
        $(top_builddir)/embed/libephyembed.la                   \
+       $(top_builddir)/gvdb/libgvdb.la                         \
        $(top_builddir)/lib/libephymisc.la                      \
        $(top_builddir)/lib/egg/libegg.la                       \
+       $(top_builddir)/lib/widgets/libephywidgets.la           \
        $(GDK_LIBS)             \
        $(GIO_LIBS)             \
        $(GLIB_LIBS)            \
diff --git a/src/bookmarks/ephy-bookmark-properties-grid.c b/src/bookmarks/ephy-bookmark-properties-grid.c
index 8280b41..e319cc7 100644
--- a/src/bookmarks/ephy-bookmark-properties-grid.c
+++ b/src/bookmarks/ephy-bookmark-properties-grid.c
@@ -26,7 +26,7 @@
 #include "ephy-debug.h"
 #include "ephy-shell.h"
 #include "ephy-sync-service.h"
-#include "ephy-bookmarks-type-builtins.h"
+#include "ephy-type-builtins.h"
 
 #include <libsoup/soup.h>
 #include <string.h>