Commit 8c09233c authored by Morten Welinder's avatar Morten Welinder

Compilation: fix up tools includes.

parent 8fbd4c85
......@@ -34,7 +34,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(srcdir) \
-I$(srcdir)/widgets \
-I$(srcdir)/tools \
$(GNUMERIC_CFLAGS)
# A hint is needed to build these headers first:
......
......@@ -19,7 +19,6 @@
#include "sheet-view.h"
#include "sheet-private.h"
#include "sheet-object.h"
#include "auto-correct.h"
#include "gutils.h"
#include "ranges.h"
#include "sheet-object.h"
......
......@@ -55,7 +55,7 @@
#include "selection.h"
#include "colrow.h"
#include "style-border.h"
#include "auto-correct.h"
#include "tools/auto-correct.h"
#include "sheet-autofill.h"
#include "mstyle.h"
#include "search.h"
......@@ -74,8 +74,8 @@
#include "auto-format.h"
#include "tools/dao.h"
#include "gnumeric-conf.h"
#include "scenarios.h"
#include "data-shuffling.h"
#include "tools/scenarios.h"
#include "tools/data-shuffling.h"
#include "tools/tabulate.h"
#include "wbc-gtk.h"
#include "undo.h"
......
......@@ -40,8 +40,8 @@
#include <gtk/gtk.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-dao.h>
#include "filter.h"
#include "analysis-tools.h"
#include "tools/filter.h"
#include "tools/analysis-tools.h"
#include "commands.h"
......
......@@ -25,8 +25,8 @@
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include "dialogs.h"
#include "analysis-chi-squared.h"
#include "analysis-tools.h"
#include "tools/analysis-chi-squared.h"
#include "tools/analysis-tools.h"
#include <workbook.h>
#include <workbook-control.h>
......
......@@ -25,8 +25,8 @@
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include "dialogs.h"
#include "analysis-frequency.h"
#include "analysis-tools.h"
#include "tools/analysis-frequency.h"
#include "tools/analysis-tools.h"
#include <workbook.h>
#include <workbook-control.h>
......
......@@ -25,8 +25,8 @@
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include "dialogs.h"
#include "analysis-kaplan-meier.h"
#include "analysis-tools.h"
#include "tools/analysis-kaplan-meier.h"
#include "tools/analysis-tools.h"
#include <workbook.h>
#include <workbook-control.h>
......
......@@ -25,8 +25,8 @@
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include "dialogs.h"
#include "analysis-normality.h"
#include "analysis-tools.h"
#include "tools/analysis-normality.h"
#include "tools/analysis-tools.h"
#include <workbook.h>
#include <workbook-control.h>
......
......@@ -25,8 +25,8 @@
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include "dialogs.h"
#include "analysis-one-mean-test.h"
#include "analysis-tools.h"
#include "tools/analysis-one-mean-test.h"
#include "tools/analysis-tools.h"
#include <workbook.h>
#include <workbook-control.h>
......
......@@ -25,8 +25,8 @@
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include "dialogs.h"
#include "analysis-principal-components.h"
#include "analysis-tools.h"
#include "tools/analysis-principal-components.h"
#include "tools/analysis-tools.h"
#include <workbook.h>
#include <workbook-control.h>
......
......@@ -25,9 +25,9 @@
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include "dialogs.h"
#include "analysis-sign-test.h"
#include "analysis-signed-rank-test.h"
#include "analysis-tools.h"
#include "tools/analysis-sign-test.h"
#include "tools/analysis-signed-rank-test.h"
#include "tools/analysis-tools.h"
#include <workbook.h>
#include <workbook-control.h>
......
......@@ -25,8 +25,8 @@
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include "dialogs.h"
#include "analysis-wilcoxon-mann-whitney.h"
#include "analysis-tools.h"
#include "tools/analysis-wilcoxon-mann-whitney.h"
#include "tools/analysis-tools.h"
#include <workbook.h>
#include <workbook-control.h>
......
......@@ -25,10 +25,10 @@
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include "dialogs.h"
#include "analysis-tools.h"
#include "analysis-anova.h"
#include "analysis-histogram.h"
#include "analysis-exp-smoothing.h"
#include "tools/analysis-tools.h"
#include "tools/analysis-anova.h"
#include "tools/analysis-histogram.h"
#include "tools/analysis-exp-smoothing.h"
#include <workbook.h>
#include <workbook-control.h>
......
......@@ -47,7 +47,7 @@
#include <dialogs/dao-gui-utils.h>
#include <gtk/gtk.h>
#include "fill-series.h"
#include "tools/fill-series.h"
#define FILL_SERIES_KEY "fill-series-dialog"
......
......@@ -42,7 +42,7 @@
#include <workbook-control.h>
#include <wbc-gtk.h>
#include <workbook-view.h>
#include <goal-seek.h>
#include <tools/goal-seek.h>
#include <mathfunc.h>
#include <widgets/gnumeric-expr-entry.h>
#include <selection.h>
......
......@@ -26,7 +26,7 @@
#include "dialogs.h"
#include "help.h"
#include "dialogs/tool-dialogs.h"
#include "random-generator-cor.h"
#include "tools/random-generator-cor.h"
#include <workbook.h>
#include <workbook-control.h>
......
......@@ -27,7 +27,7 @@
#include "dialogs.h"
#include "help.h"
#include "dialogs/tool-dialogs.h"
#include "random-generator.h"
#include "tools/random-generator.h"
#include <workbook.h>
#include <workbook-control.h>
......
......@@ -36,8 +36,8 @@
#include <ranges.h>
#include <value.h>
#include <cell.h>
#include <dao.h>
#include "scenarios.h"
#include <tools/dao.h>
#include "tools/scenarios.h"
#include <gtk/gtk.h>
#include <goffice/goffice.h>
......
......@@ -41,7 +41,7 @@
#include <gtk/gtk.h>
#include <widgets/gnumeric-expr-entry.h>
#include "data-shuffling.h"
#include <tools/data-shuffling.h>
#define SHUFFLE_KEY "shuffle-dialog"
......
......@@ -35,7 +35,7 @@
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-dao.h>
#include "simulation.h"
#include "tools/simulation.h"
#include <string.h>
#include <gtk/gtk.h>
......
......@@ -50,7 +50,7 @@
#include <gtk/gtk.h>
#include <goffice/goffice.h>
#include <string.h>
#include <scenarios.h>
#include <tools/scenarios.h>
#define SOLVER_KEY "solver-dialog"
......
......@@ -61,7 +61,7 @@
#include "sheet-filter.h"
#include "sheet-filter-combo.h"
#include "gnm-sheet-slicer.h"
#include "scenarios.h"
#include "tools/scenarios.h"
#include "cell-draw.h"
#include "sort.h"
#include "gutils.h"
......
......@@ -28,7 +28,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "dao.h"
#include <tools/dao.h>
#include "tools.h"
#include "analysis-tools.h"
......
......@@ -28,7 +28,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "dao.h"
#include <tools/dao.h>
#include "tools.h"
#include "analysis-tools.h"
#include "sheet.h"
......
......@@ -28,7 +28,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "dao.h"
#include <tools/dao.h>
#include "tools.h"
#include "analysis-tools.h"
#include "sheet.h"
......
......@@ -30,7 +30,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "dao.h"
#include <tools/dao.h>
#include "tools.h"
#include "analysis-tools.h"
......
......@@ -28,7 +28,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "dao.h"
#include <tools/dao.h>
#include "tools.h"
#include "analysis-tools.h"
......
......@@ -30,7 +30,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "dao.h"
#include <tools/dao.h>
#include "tools.h"
#include "analysis-tools.h"
......
......@@ -28,7 +28,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "dao.h"
#include <tools/dao.h>
#include "tools.h"
#include "analysis-tools.h"
......
......@@ -28,7 +28,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "dao.h"
#include <tools/dao.h>
#include "tools.h"
#include "analysis-tools.h"
......
......@@ -28,7 +28,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "dao.h"
#include <tools/dao.h>
#include "tools.h"
#include "analysis-tools.h"
#include "sheet.h"
......
......@@ -28,7 +28,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "dao.h"
#include <tools/dao.h>
#include "tools.h"
#include "analysis-tools.h"
#include "sheet.h"
......
......@@ -28,7 +28,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "dao.h"
#include <tools/dao.h>
#include "tools.h"
#include "analysis-tools.h"
#include "sheet.h"
......
......@@ -28,7 +28,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "dao.h"
#include <tools/dao.h>
#include "tools.h"
#include "analysis-tools.h"
#include "analysis-sign-test.h"
......
......@@ -4,7 +4,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "dao.h"
#include <tools/dao.h>
#include "tools.h"
#include "regression.h"
#include "func.h"
......
......@@ -28,7 +28,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "dao.h"
#include <tools/dao.h>
#include "tools.h"
#include "analysis-tools.h"
#include "sheet.h"
......
......@@ -25,7 +25,7 @@
*/
#include <gnumeric-config.h>
#include "dao.h"
#include <tools/dao.h>
#include "expr.h"
#include "value.h"
......
......@@ -35,8 +35,7 @@
#include <goffice/goffice.h>
#include "gnm-random.h"
#include "data-shuffling.h"
#include "dao.h"
#include "tools/data-shuffling.h"
#include "expr.h"
......
......@@ -2,7 +2,7 @@
#define __DATA_SHUFFLING_H__
#include <gnumeric.h>
#include <dao.h>
#include <tools/dao.h>
#define SHUFFLE_COLS 0
......
......@@ -39,8 +39,7 @@
#include "gnm-datetime.h"
#include "mathfunc.h"
#include "fill-series.h"
#include "dao.h"
#include "tools/fill-series.h"
#include <goffice/goffice.h>
static void
......
......@@ -2,7 +2,7 @@
#define __FILL_SERIES_H__
#include <gnumeric.h>
#include <dao.h>
#include <tools/dao.h>
typedef enum {
......
......@@ -2,7 +2,7 @@
#define __FILTER_H__
#include <gnumeric.h>
#include <dao.h>
#include <tools/dao.h>
gint advanced_filter (WorkbookControl *wbc,
data_analysis_output_t *dao,
......
......@@ -15,7 +15,7 @@
#include "workbook-control.h"
#include "application.h"
#include "gnm-marshalers.h"
#include "dao.h"
#include <tools/dao.h>
#include "gui-util.h"
#include "gnm-i18n.h"
#include <gsf/gsf-impl-utils.h>
......
......@@ -30,8 +30,8 @@
#include "value.h"
#include "ranges.h"
#include "expr.h"
#include "dao.h"
#include "dao.h"
#include <tools/dao.h>
#include <tools/dao.h>
#include "sheet.h"
#include "func.h"
#include "numbers.h"
......
......@@ -3,7 +3,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "dao.h"
#include <tools/dao.h>
#include "tools.h"
typedef enum {
......
......@@ -3,7 +3,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "dao.h"
#include <tools/dao.h>
#include "tools.h"
......
......@@ -32,7 +32,7 @@
#include <expr.h>
#include "scenarios.h"
#include "dao.h"
#include <tools/dao.h>
#include "clipboard.h"
#include "parse-util.h"
#include <goffice/goffice.h>
......
......@@ -3,7 +3,7 @@
#ifndef __SIMULATION_H__
#define __SIMULATION_H__
#include "dao.h"
#include <tools/dao.h>
typedef enum {
MedianErr = 1, ModeErr = 2, StddevErr = 4, VarErr = 8, SkewErr = 16,
......
......@@ -3,7 +3,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "dao.h"
#include <tools/dao.h>
#include "tools.h"
typedef struct {
......
......@@ -17,7 +17,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "dao.h"
#include <tools/dao.h>
typedef enum {
TOOL_ENGINE_UPDATE_DAO = 0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment