X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fautomake.mk;h=7b4f5f7bf10cc53c15d5bc8af5bf07e5463d1272;hb=1cc38c81dfaffff382575e71109b79423d3f5bea;hp=78898f46d41d868ce54730ab908acea38cd5cb3e;hpb=fdcc4b6875ccdbf7bd01bc401e87afbeb71c2bfd;p=pspp

diff --git a/src/output/automake.mk b/src/output/automake.mk
index 78898f46d4..7b4f5f7bf1 100644
--- a/src/output/automake.mk
+++ b/src/output/automake.mk
@@ -3,9 +3,9 @@
 
 include $(top_srcdir)/src/output/charts/automake.mk
 
-noinst_LIBRARIES += src/output/liboutput.a 
+noinst_LTLIBRARIES += src/output/liboutput.la 
 
-output_sources = \
+src_output_liboutput_la_SOURCES = \
 	src/output/afm.c \
 	src/output/afm.h \
 	src/output/ascii.c \
@@ -19,17 +19,15 @@ output_sources = \
 	src/output/manager.c \
 	src/output/manager.h \
 	src/output/chart.h \
-	src/output/table.c src/output/table.h
-
-
+	src/output/table.c \
+	src/output/table.h
+if HAVE_CAIRO
+src_output_liboutput_la_SOURCES += src/output/cairo.c
+endif
 if WITHCHARTS
-src_output_liboutput_a_SOURCES = $(output_sources) src/output/chart.c
-
-EXTRA_DIST += src/output/dummy-chart.c
+src_output_liboutput_la_SOURCES += src/output/chart.c
 else
-src_output_liboutput_a_SOURCES = $(output_sources) src/output/dummy-chart.c
-
-EXTRA_DIST += src/output/chart.c
+src_output_liboutput_la_SOURCES += src/output/dummy-chart.c
 endif
 
-
+EXTRA_DIST += src/output/OChangeLog