output-item: Collapse the inheritance hierarchy into a single struct.

[pspp] / src / output / automake.mk

diff --git a/src/output/automake.mk b/src/output/automake.mk
index fb476f4649d6a0785e700e810423a66420811138..61c812767d821e6878c7c04a86cef17ea1eef619 100644 (file)
--- a/src/output/automake.mk
+++ b/src/output/automake.mk
@@ -23,58 +23,61 @@ src_output_liboutput_la_CPPFLAGS = $(LIBXML2_CFLAGS) $(AM_CPPFLAGS)
 src_output_liboutput_la_SOURCES = \
        src/output/ascii.c \
        src/output/ascii.h \
-       src/output/chart-item-provider.h \
-       src/output/chart-item.c \
-       src/output/chart-item.h \
+       src/output/cairo-chart.c \
+       src/output/cairo-chart.h \
+       src/output/cairo-fsm.c \
+       src/output/cairo-fsm.h \
+       src/output/cairo-pager.c \
+       src/output/cairo-pager.h \
+       src/output/cairo.c \
+       src/output/chart-provider.h \
+       src/output/chart.c \
+       src/output/chart.h \
+       src/output/charts/barchart-cairo.c \
+       src/output/charts/barchart.c \
+       src/output/charts/barchart.h \
+       src/output/charts/boxplot-cairo.c \
        src/output/charts/boxplot.c \
        src/output/charts/boxplot.h \
+       src/output/charts/np-plot-cairo.c \
        src/output/charts/np-plot.c \
        src/output/charts/np-plot.h \
-       src/output/charts/barchart.c \
-       src/output/charts/barchart.h \
+       src/output/charts/piechart-cairo.c \
        src/output/charts/piechart.c \
        src/output/charts/piechart.h \
+       src/output/charts/plot-hist-cairo.c \
        src/output/charts/plot-hist.c \
        src/output/charts/plot-hist.h \
+       src/output/charts/roc-chart-cairo.c \
        src/output/charts/roc-chart.c \
        src/output/charts/roc-chart.h \
-       src/output/charts/spreadlevel-plot.c \
-       src/output/charts/spreadlevel-plot.h \
-       src/output/charts/scree.c \
-       src/output/charts/scree.h \
+       src/output/charts/scatterplot-cairo.c \
        src/output/charts/scatterplot.c \
        src/output/charts/scatterplot.h \
+       src/output/charts/scree-cairo.c \
+       src/output/charts/scree.c \
+       src/output/charts/scree.h \
+       src/output/charts/spreadlevel-cairo.c \
+       src/output/charts/spreadlevel-plot.c \
+       src/output/charts/spreadlevel-plot.h \
        src/output/csv.c \
        src/output/driver-provider.h \
        src/output/driver.c \
        src/output/driver.h \
-       src/output/tex-glyphs.c \
-       src/output/tex-glyphs.h \
-       src/output/tex-parsing.c \
-       src/output/tex-parsing.h \
-       src/output/tex-rendering.c \
-       src/output/tex-rendering.h \
-       src/output/group-item.c \
-       src/output/group-item.h \
        src/output/html.c \
        src/output/journal.c \
        src/output/journal.h \
        src/output/measure.c \
        src/output/measure.h \
-       src/output/message-item.c \
-       src/output/message-item.h \
        src/output/msglog.c \
        src/output/msglog.h \
        src/output/odt.c \
        src/output/options.c \
        src/output/options.h \
-       src/output/output-item-provider.h \
        src/output/output-item.c \
        src/output/output-item.h \
-       src/output/page-eject-item.c \
-       src/output/page-eject-item.h \
-       src/output/page-setup-item.c \
-       src/output/page-setup-item.h \
+       src/output/page-setup.c \
+       src/output/page-setup.h \
        src/output/pivot-output.c \
        src/output/pivot-output.h \
        src/output/pivot-table.c \
@@ -82,33 +85,16 @@ src_output_liboutput_la_SOURCES = \
        src/output/render.c \
        src/output/render.h \
        src/output/spv-driver.c \
-       src/output/table-item.c \
-       src/output/table-item.h \
        src/output/table-provider.h \
        src/output/table.c \
        src/output/table.h \
-       src/output/tex.c \
-       src/output/text-item.c \
-       src/output/text-item.h
-if HAVE_CAIRO
-src_output_liboutput_la_SOURCES += \
-       src/output/cairo-chart.c \
-       src/output/cairo-chart.h \
-       src/output/cairo-fsm.c \
-       src/output/cairo-fsm.h \
-       src/output/cairo-pager.c \
-       src/output/cairo-pager.h \
-       src/output/cairo.c \
-       src/output/charts/boxplot-cairo.c \
-       src/output/charts/np-plot-cairo.c \
-       src/output/charts/barchart-cairo.c \
-       src/output/charts/piechart-cairo.c \
-       src/output/charts/plot-hist-cairo.c \
-       src/output/charts/roc-chart-cairo.c \
-       src/output/charts/scree-cairo.c \
-       src/output/charts/spreadlevel-cairo.c \
-       src/output/charts/scatterplot-cairo.c
-endif
+       src/output/tex-glyphs.c \
+       src/output/tex-glyphs.h \
+       src/output/tex-parsing.c \
+       src/output/tex-parsing.h \
+       src/output/tex-rendering.c \
+       src/output/tex-rendering.h \
+       src/output/tex.c
 nodist_src_output_liboutput_la_SOURCES =
 
 EXTRA_DIST += \