[gnumeric] Packaging: don't install dialog headers.

[Morten Welinder <mortenw src gnome org>]

commit e3daece24f2b83488ca19b20ffcbd1cbd3f0dc87
Author: Morten Welinder <terra gnome org>
Date:   Tue May 15 23:03:12 2018 -0400

    Packaging: don't install dialog headers.

 src/Makefile.am                |    9 +++++----
 src/dialogs/dao-gui-utils.c    |    1 +
 src/dialogs/dao-gui-utils.h    |    5 -----
 src/dialogs/dialog-scenarios.c |    1 +
 src/dialogs/tool-dialogs.h     |    1 -
 src/gnumeric-fwd.h             |    1 +
 6 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index ad24806..b5a77e6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,8 @@
-#
 # Gnumeric's Makefile.am
 # Author: Miguel de Icaza (miguel kernel org)
+
+AUTOMAKE_OPTIONS = subdir-objects
+
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = \
@@ -22,8 +24,6 @@ bin_PROGRAMS =
 check_PROGRAMS =
 noinst_PROGRAMS = sstest
 
-noinst_HEADERS = dead-kittens.h compilation.h gnm-i18n.h
-
 if WITH_GTK
   bin_PROGRAMS += gnumeric
 endif
@@ -311,6 +311,8 @@ tools_headers = \
        tools/tabulate.h                        \
        tools/tools.h
 
+noinst_HEADERS = dead-kittens.h compilation.h gnm-i18n.h \
+       $(dialogs_headers)
 
 # Another hint, see bugs #172211 and #172212:
 non-intermediate: gnm-marshalers.c gnmresources.c
@@ -626,7 +628,6 @@ libspreadsheet_include_HEADERS =            \
        workbook.h                              \
        xml-io-version.h                        \
        xml-sax.h                               \
-       $(dialogs_headers)                      \
        $(tools_headers)                        \
        $(widgets_headers)
 
diff --git a/src/dialogs/dao-gui-utils.c b/src/dialogs/dao-gui-utils.c
index 01e8a55..1ff0ff8 100644
--- a/src/dialogs/dao-gui-utils.c
+++ b/src/dialogs/dao-gui-utils.c
@@ -32,6 +32,7 @@
 #include "gui-util.h"
 #include "selection.h"
 #include <widgets/gnm-dao.h>
+#include "dialogs/tool-dialogs.h"
 
 
 /**
diff --git a/src/dialogs/dao-gui-utils.h b/src/dialogs/dao-gui-utils.h
index d3d3037..422da73 100644
--- a/src/dialogs/dao-gui-utils.h
+++ b/src/dialogs/dao-gui-utils.h
@@ -1,5 +1,3 @@
-/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
  * dao-gui-utils.h:
  *
@@ -28,9 +26,6 @@
 #define GNUMERIC_DAO_GUI_UTILS_H
 
 #include "gnumeric.h"
-#include "numbers.h"
-#include <widgets/gnumeric-expr-entry.h>
-#include "dialogs/tool-dialogs.h"
 #include "tools/dao.h"
 
 
diff --git a/src/dialogs/dialog-scenarios.c b/src/dialogs/dialog-scenarios.c
index 6b73f10..9872be0 100644
--- a/src/dialogs/dialog-scenarios.c
+++ b/src/dialogs/dialog-scenarios.c
@@ -38,6 +38,7 @@
 #include <cell.h>
 #include <tools/dao.h>
 #include "tools/scenarios.h"
+#include "dialogs/tool-dialogs.h"
 
 #include <goffice/goffice.h>
 #include <string.h>
diff --git a/src/dialogs/tool-dialogs.h b/src/dialogs/tool-dialogs.h
index aac0ad5..f925238 100644
--- a/src/dialogs/tool-dialogs.h
+++ b/src/dialogs/tool-dialogs.h
@@ -22,7 +22,6 @@
 
 typedef struct _scenario_state scenario_state_t;
 
-typedef struct _GenericToolState GnmGenericToolState;
 typedef void (*state_destroy_t) (GnmGenericToolState *state);
 
 struct _GenericToolState {
diff --git a/src/gnumeric-fwd.h b/src/gnumeric-fwd.h
index 584508b..87f6966 100644
--- a/src/gnumeric-fwd.h
+++ b/src/gnumeric-fwd.h
@@ -103,6 +103,7 @@ typedef struct _WorkbookSheetState  WorkbookSheetState;
 typedef struct _WorkbookView           WorkbookView;
 typedef union  _GnmExpr                        GnmExpr;
 typedef union  _GnmValue               GnmValue;
+typedef struct _GenericToolState       GnmGenericToolState;
 
 typedef GList                          ColRowIndexList;
 typedef GSList                         ColRowStateGroup;