[devhelp: 7/7] Compile DhApp, DhAssistant and DhWindow in the app, not the lib

[Sébastien Wilmet <swilmet src gnome org>]

commit 20abd844bbebbb5a662036fd4c4c832794e4a8a0
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Wed May 3 17:15:24 2017 +0200

    Compile DhApp, DhAssistant and DhWindow in the app, not the lib
    
    To remove those classes from the public library API.
    
    DhApp is not re-usable. DhApp is a subclass of GtkApplication. An
    application can have only one GtkApplication instance, so DhApp in the
    current state doesn't make sense as a library.
    
    DhAssistant and DhWindow depend on DhApp, so they are not re-usable
    either, it was not possible to use them in another app.
    
    dh-app.h was not #included in devhelp.h.
    
    The classes will maybe come back to the library in the future, in a
    better shape.

 src/Makefile.am |   18 +++++++++---------
 src/devhelp.h   |    2 --
 src/dh-window.c |    2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 61b4e3d..30358dc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,8 +11,6 @@ AM_LDFLAGS =                                          \
 
 libdevhelp_public_headers =            \
        devhelp.h                       \
-       dh-app.h                        \
-       dh-assistant.h                  \
        dh-assistant-view.h             \
        dh-book.h                       \
        dh-book-manager.h               \
@@ -21,12 +19,9 @@ libdevhelp_public_headers =          \
        dh-language.h                   \
        dh-link.h                       \
        dh-sidebar.h                    \
-       dh-window.h                     \
        $(NULL)
 
 libdevhelp_public_c_files =            \
-       dh-app.c                        \
-       dh-assistant.c                  \
        dh-assistant-view.c             \
        dh-book.c                       \
        dh-book-manager.c               \
@@ -36,7 +31,6 @@ libdevhelp_public_c_files =           \
        dh-language.c                   \
        dh-link.c                       \
        dh-sidebar.c                    \
-       dh-window.c                     \
        $(NULL)
 
 libdevhelp_private_headers =           \
@@ -70,11 +64,17 @@ libdevhelp_built_sources =                  \
        dh-resources.h                          \
        $(NULL)
 
-app_headers =          \
+app_headers =                  \
+       dh-app.h                \
+       dh-assistant.h          \
+       dh-window.h             \
        $(NULL)
 
-app_c_files =          \
-       dh-main.c       \
+app_c_files =                  \
+       dh-app.c                \
+       dh-assistant.c          \
+       dh-main.c               \
+       dh-window.c             \
        $(NULL)
 
 app_built_headers =            \
diff --git a/src/devhelp.h b/src/devhelp.h
index 156ebc9..ac1b967 100644
--- a/src/devhelp.h
+++ b/src/devhelp.h
@@ -22,7 +22,6 @@
 #include <glib.h>
 
 /* Explicitly include all the exported headers */
-#include "dh-assistant.h"
 #include "dh-assistant-view.h"
 #include "dh-book-manager.h"
 #include "dh-language.h"
@@ -31,7 +30,6 @@
 #include "dh-keyword-model.h"
 #include "dh-link.h"
 #include "dh-sidebar.h"
-#include "dh-window.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/dh-window.c b/src/dh-window.c
index 8103113..084b0fb 100644
--- a/src/dh-window.c
+++ b/src/dh-window.c
@@ -31,8 +31,8 @@
 #include "dh-book.h"
 #include "dh-sidebar.h"
 #include "dh-util.h"
-#include "dh-enum-types.h"
 #include "dh-settings.h"
+#include "dh-enum-types-app.h"
 
 typedef struct {
         GMenuModel     *gear_app_menu;