X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fautomake.mk;h=1d9f65868bfdb651ffb68d35096926a325449dcf;hb=dfd1972f7bcb550a4fc3b05dbe7e71d12334b0a7;hp=ec92c559e044723180977db31ca43708c7f637bd;hpb=c3ac5a8af9c449072c7e872ca70a78c1755ae309;p=pspp-builds.git

diff --git a/src/output/automake.mk b/src/output/automake.mk
index ec92c559..1d9f6586 100644
--- a/src/output/automake.mk
+++ b/src/output/automake.mk
@@ -1,35 +1,68 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-
-include $(top_srcdir)/src/output/charts/automake.mk
-
 noinst_LTLIBRARIES += src/output/liboutput.la 
 
-output_sources = \
-	src/output/afm.c \
-	src/output/afm.h \
+src_output_liboutput_la_CPPFLAGS = $(LIBXML2_CFLAGS) $(AM_CPPFLAGS) 
+
+src_output_liboutput_la_SOURCES = \
 	src/output/ascii.c \
+	src/output/chart-item-provider.h \
+	src/output/chart-item.c \
+	src/output/chart-item.h \
+	src/output/charts/boxplot.c \
+	src/output/charts/boxplot.h \
+	src/output/charts/np-plot.c \
+	src/output/charts/np-plot.h \
+	src/output/charts/piechart.c \
+	src/output/charts/piechart.h \
+	src/output/charts/plot-hist.c \
+	src/output/charts/plot-hist.h \
+	src/output/charts/roc-chart.c \
+	src/output/charts/roc-chart.h \
+	src/output/charts/scree.c \
+	src/output/charts/scree.h \
+	src/output/csv.c \
+	src/output/driver-provider.h \
+	src/output/driver.c \
+	src/output/driver.h \
 	src/output/html.c \
-	src/output/htmlP.h \
 	src/output/journal.c \
 	src/output/journal.h \
-	src/output/output.c \
-	src/output/output.h \
-	src/output/postscript.c \
-	src/output/manager.c \
-	src/output/manager.h \
-	src/output/chart.h \
-	src/output/table.c src/output/table.h
-
-
-if WITHCHARTS
-src_output_liboutput_la_SOURCES = $(output_sources) src/output/chart.c
-
-EXTRA_DIST += src/output/dummy-chart.c
-else
-src_output_liboutput_la_SOURCES = $(output_sources) src/output/dummy-chart.c
-
-EXTRA_DIST += src/output/chart.c
+	src/output/measure.c \
+	src/output/measure.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/render.c \
+	src/output/render.h \
+	src/output/tab.c \
+	src/output/tab.h \
+	src/output/table-casereader.c \
+	src/output/table-item.c \
+	src/output/table-item.h \
+	src/output/table-paste.c \
+	src/output/table-provider.h \
+	src/output/table-select.c \
+	src/output/table-transpose.c \
+	src/output/table.c \
+	src/output/table.h \
+	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.c \
+	src/output/cairo.h \
+	src/output/charts/boxplot-cairo.c \
+	src/output/charts/np-plot-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
 endif
 
 EXTRA_DIST += src/output/OChangeLog