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

diff --git a/src/output/automake.mk b/src/output/automake.mk
index ec92c559..34aac525 100644
--- a/src/output/automake.mk
+++ b/src/output/automake.mk
@@ -1,35 +1,41 @@
 ## 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_liboutput_la_CPPFLAGS = $(LIBXML2_CFLAGS) $(AM_CPPFLAGS) 
+
+src_output_liboutput_la_SOURCES = \
 	src/output/afm.c \
 	src/output/afm.h \
 	src/output/ascii.c \
+	src/output/chart.c \
+	src/output/chart.h \
+	src/output/charts/box-whisker.c \
+	src/output/charts/box-whisker.h \
+	src/output/charts/cartesian.c \
+	src/output/charts/cartesian.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-chart.c \
+	src/output/charts/plot-chart.h \
+	src/output/charts/plot-hist.c \
+	src/output/charts/plot-hist.h \
 	src/output/html.c \
 	src/output/htmlP.h \
 	src/output/journal.c \
 	src/output/journal.h \
+	src/output/manager.c \
+	src/output/manager.h \
+	src/output/odt.c \
 	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/table.c \
+	src/output/table.h
+if HAVE_CAIRO
+src_output_liboutput_la_SOURCES += src/output/cairo.c
 endif
 
 EXTRA_DIST += src/output/OChangeLog