[epiphany/wip/bookmarks: 72/76] bookmarks: Move everything to a new bookmarks directory

[Iulian Radu <iulianradu src gnome org>]

commit dea972c3c4f15e627889f348f66f22ac9b2a9222
Author: Iulian Radu <iulian radu67 gmail com>
Date:   Tue Sep 27 20:34:18 2016 +0300

    bookmarks: Move everything to a new bookmarks directory

 src/Makefile.am                                    |   22 +---
 src/bookmarks/Makefile.am                          |  109 ++++++++++++++++++++
 src/{ => bookmarks}/ephy-add-bookmark-popover.c    |    0
 src/{ => bookmarks}/ephy-add-bookmark-popover.h    |    0
 .../ephy-bookmark-properties-grid.c                |    2 +-
 .../ephy-bookmark-properties-grid.h                |    0
 src/{ => bookmarks}/ephy-bookmark-row.c            |    0
 src/{ => bookmarks}/ephy-bookmark-row.h            |    0
 src/{ => bookmarks}/ephy-bookmark.c                |    0
 src/{ => bookmarks}/ephy-bookmark.h                |    0
 src/{ => bookmarks}/ephy-bookmarks-manager.c       |    0
 src/{ => bookmarks}/ephy-bookmarks-manager.h       |    0
 src/{ => bookmarks}/ephy-bookmarks-popover.c       |    0
 src/{ => bookmarks}/ephy-bookmarks-popover.h       |    0
 14 files changed, 114 insertions(+), 19 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index f617a2f..a0a5e2e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . search-provider profile-migrator
+SUBDIRS = bookmarks . search-provider profile-migrator
 
 pkglib_LTLIBRARIES = libephymain.la
 
@@ -10,7 +10,6 @@ dist_noinst_DATA = \
 
 TYPES_H_FILES = \
        ephy-link.h                             \
-       ephy-bookmark-properties-grid.h         \
        ephy-session.h                          \
        ephy-shell.h                            \
        ephy-window.h
@@ -22,18 +21,6 @@ libephymain_la_SOURCES = \
        cookies-dialog.h                        \
        ephy-action-helper.c                    \
        ephy-action-helper.h                    \
-       ephy-add-bookmark-popover.c             \
-       ephy-add-bookmark-popover.h             \
-       ephy-bookmark.c                         \
-       ephy-bookmark.h                         \
-       ephy-bookmark-properties-grid.c         \
-       ephy-bookmark-properties-grid.h         \
-       ephy-bookmark-row.c                     \
-       ephy-bookmark-row.h                     \
-       ephy-bookmarks-manager.c                \
-       ephy-bookmarks-manager.h                \
-       ephy-bookmarks-popover.c                \
-       ephy-bookmarks-popover.h                \
        ephy-completion-model.c                 \
        ephy-completion-model.h                 \
        ephy-encoding-dialog.c                  \
@@ -76,14 +63,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)/lib             \
        -I$(top_srcdir)/lib/egg         \
        -I$(top_srcdir)/lib/history     \
        -I$(top_srcdir)/lib/widgets     \
        -I$(top_srcdir)/gvdb            \
-       -DLOADER_DIR=\""$(pkglibdir)/$(EPIPHANY_MAJOR)/loaders"\"               \
-       -DDATADIR=\""$(pkgdatadir)"\"   \
        -DLOCALEDIR=\"$(localedir)\"    \
        -DPKGDATADIR=\"$(pkgdatadir)\"  \
        $(GDK_CFLAGS)                   \
@@ -103,11 +89,10 @@ 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)/lib/widgets/libephywidgets.la           \
        $(top_builddir)/lib/libephymisc.la                      \
        $(top_builddir)/lib/egg/libegg.la                       \
-       $(top_builddir)/gvdb/libgvdb.la                         \
        $(GDK_LIBS)             \
        $(GIO_LIBS)             \
        $(GLIB_LIBS)            \
@@ -176,6 +161,7 @@ epiphany_CPPFLAGS = \
        -I$(top_srcdir)/lib/history     \
        -I$(top_srcdir)/lib/widgets     \
        -I$(top_builddir)/lib/widgets   \
+       -I$(top_srcdir)/src/bookmarks   \
        -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
        -DLOCALEDIR=\"$(localedir)\"    \
        $(GLIB_CFLAGS)                  \
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
new file mode 100644
index 0000000..5d747f7
--- /dev/null
+++ b/src/bookmarks/Makefile.am
@@ -0,0 +1,109 @@
+noinst_LTLIBRARIES = libephybookmarks.la
+
+TYPES_H_FILES = \
+       ephy-bookmark-properties-grid.h
+
+libephybookmarks_la_SOURCES = \
+       ephy-add-bookmark-popover.c     \
+       ephy-add-bookmark-popover.h     \
+       ephy-bookmark.c                 \
+       ephy-bookmark.h                 \
+       ephy-bookmark-properties-grid.c \
+       ephy-bookmark-properties-grid.h \
+       ephy-bookmark-row.c             \
+       ephy-bookmark-row.h             \
+       ephy-bookmarks-manager.c        \
+       ephy-bookmarks-manager.h        \
+       ephy-bookmarks-popover.c        \
+       ephy-bookmarks-popover.h
+
+libephybookmarks_la_CPPFLAGS = \
+       -I$(top_builddir)/lib                           \
+       -I$(top_builddir)/lib/widgets                   \
+       -I$(top_srcdir)/embed                           \
+       -I$(top_srcdir)/gvdb                            \
+       -I$(top_srcdir)/lib                             \
+       -I$(top_srcdir)/lib/history                     \
+       -I$(top_srcdir)/lib/widgets                     \
+       -I$(top_srcdir)/src                             \
+       -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"        \
+       -DLOCALEDIR=\"$(localedir)\"                    \
+       $(GLIB_CFLAGS)                                  \
+       $(GTK_CFLAGS)                                   \
+       $(LIBSECRET_CFLAGS)                             \
+       $(LIBSOUP_CFLAGS)                               \
+       $(WEBKIT2GTK_CFLAGS)
+
+libephybookmarks_la_LIBADD = \
+       $(top_builddir)/gvdb/libgvdb.la                 \
+       $(top_builddir)/lib/libephymisc.la              \
+       $(top_builddir)/lib/widgets/libephywidgets.la   \
+       $(GLIB_LIBS)                                    \
+       $(GTK_LIBS)                                     \
+       $(LIBSECRET_LIBS)                               \
+       $(LIBSOUP_LIBS)                                 \
+       $(WEBKIT2GTK_LIBS)
+
+libephybookmarks_la_CFLAGS = \
+       $(WARN_CFLAGS)
+
+libephybookmarks_la_LDFLAGS = \
+       $(WARN_LDFLAGS)
+
+nodist_libephybookmarks_la_SOURCES = \
+       $(BUILT_SOURCES)
+
+BUILT_SOURCES =        $(TYPES_SOURCE)
+
+TYPES_SOURCE = \
+       ephy-bookmarks-type-builtins.c  \
+       ephy-bookmarks-type-builtins.h
+
+stamp_files = \
+       stamp-ephy-bookmarks-type-builtins.c    \
+       stamp-ephy-bookmarks-type-builtins.h
+
+ephy-bookmarks-type-builtins.c: stamp-ephy-bookmarks-type-builtins.c Makefile
+       @true
+stamp-ephy-bookmarks-type-builtins.c: Makefile $(TYPES_H_FILES)
+       $(AM_V_GEN) $(GLIB_MKENUMS) \
+               --fhead "#include <config.h>\n\n" \
+               --fhead "#include \"ephy-bookmarks-type-builtins.h\"\n\n" \
+               --fprod "\n/* enumerations from \"@filename@\" */" \
+               --fprod "\n#include \"@filename@\"" \
+               --vhead "GType\n@enum_name@_get_type (void)\n{\n" \
+               --vhead "  static GType type = 0;\n\n" \
+               --vhead "  if (G_UNLIKELY (type == 0))\n  {\n" \
+               --vhead "    static const G@Type@Value _@enum_name@_values[] = {" \
+               --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+               --vtail "      { 0, NULL, NULL }\n    };\n\n" \
+               --vtail "    type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n  }\n\n" 
\
+               --vtail "  return type;\n}\n\n" \
+               $(filter-out $<,$^) > xgen-$(@F) \
+       && ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \
+       && rm -f xgen-$(@F) \
+       && echo timestamp > $(@F)
+
+ephy-bookmarks-type-builtins.h: stamp-ephy-bookmarks-type-builtins.h Makefile
+       @true
+stamp-ephy-bookmarks-type-builtins.h: Makefile $(TYPES_H_FILES)
+       $(AM_V_GEN) $(GLIB_MKENUMS) \
+               --fhead "#ifndef EPHY_TYPE_BUILTINS_H\n" \
+               --fhead "#define EPHY_TYPE_BUILTINS_H 1\n\n" \
+               --fhead "#include <glib-object.h>\n\n" \
+               --fhead "G_BEGIN_DECLS\n\n" \
+               --ftail "G_END_DECLS\n\n" \
+               --ftail "#endif /* EPHY_TYPE_BUILTINS_H */\n" \
+               --fprod "\n/* --- @filename@ --- */" \
+               --eprod "#define EPHY_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
+               --eprod "GType @enum_name@_get_type (void);\n" \
+               $(filter-out $<,$^) > xgen-$(@F) \
+       && ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \
+       && rm -f xgen-$(@F) \
+       && echo timestamp > $(@F)
+
+CLEANFILES = \
+       $(stamp_files) \
+       $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/ephy-add-bookmark-popover.c b/src/bookmarks/ephy-add-bookmark-popover.c
similarity index 100%
rename from src/ephy-add-bookmark-popover.c
rename to src/bookmarks/ephy-add-bookmark-popover.c
diff --git a/src/ephy-add-bookmark-popover.h b/src/bookmarks/ephy-add-bookmark-popover.h
similarity index 100%
rename from src/ephy-add-bookmark-popover.h
rename to src/bookmarks/ephy-add-bookmark-popover.h
diff --git a/src/ephy-bookmark-properties-grid.c b/src/bookmarks/ephy-bookmark-properties-grid.c
similarity index 99%
rename from src/ephy-bookmark-properties-grid.c
rename to src/bookmarks/ephy-bookmark-properties-grid.c
index fb87078..a6d041a 100644
--- a/src/ephy-bookmark-properties-grid.c
+++ b/src/bookmarks/ephy-bookmark-properties-grid.c
@@ -23,7 +23,7 @@
 #include "ephy-bookmarks-manager.h"
 #include "ephy-debug.h"
 #include "ephy-shell.h"
-#include "ephy-type-builtins.h"
+#include "ephy-bookmarks-type-builtins.h"
 
 #include <libsoup/soup.h>
 #include <string.h>
diff --git a/src/ephy-bookmark-properties-grid.h b/src/bookmarks/ephy-bookmark-properties-grid.h
similarity index 100%
rename from src/ephy-bookmark-properties-grid.h
rename to src/bookmarks/ephy-bookmark-properties-grid.h
diff --git a/src/ephy-bookmark-row.c b/src/bookmarks/ephy-bookmark-row.c
similarity index 100%
rename from src/ephy-bookmark-row.c
rename to src/bookmarks/ephy-bookmark-row.c
diff --git a/src/ephy-bookmark-row.h b/src/bookmarks/ephy-bookmark-row.h
similarity index 100%
rename from src/ephy-bookmark-row.h
rename to src/bookmarks/ephy-bookmark-row.h
diff --git a/src/ephy-bookmark.c b/src/bookmarks/ephy-bookmark.c
similarity index 100%
rename from src/ephy-bookmark.c
rename to src/bookmarks/ephy-bookmark.c
diff --git a/src/ephy-bookmark.h b/src/bookmarks/ephy-bookmark.h
similarity index 100%
rename from src/ephy-bookmark.h
rename to src/bookmarks/ephy-bookmark.h
diff --git a/src/ephy-bookmarks-manager.c b/src/bookmarks/ephy-bookmarks-manager.c
similarity index 100%
rename from src/ephy-bookmarks-manager.c
rename to src/bookmarks/ephy-bookmarks-manager.c
diff --git a/src/ephy-bookmarks-manager.h b/src/bookmarks/ephy-bookmarks-manager.h
similarity index 100%
rename from src/ephy-bookmarks-manager.h
rename to src/bookmarks/ephy-bookmarks-manager.h
diff --git a/src/ephy-bookmarks-popover.c b/src/bookmarks/ephy-bookmarks-popover.c
similarity index 100%
rename from src/ephy-bookmarks-popover.c
rename to src/bookmarks/ephy-bookmarks-popover.c
diff --git a/src/ephy-bookmarks-popover.h b/src/bookmarks/ephy-bookmarks-popover.h
similarity index 100%
rename from src/ephy-bookmarks-popover.h
rename to src/bookmarks/ephy-bookmarks-popover.h