Merge commit 'origin/stable'

[pspp-builds.git] / src / output / automake.mk

diff --git a/src/output/automake.mk b/src/output/automake.mk
index 0d3a10971bf976de4dbc890772d016d37e8d94b4..ec92c559e044723180977db31ca43708c7f637bd 100644 (file)
--- a/src/output/automake.mk
+++ b/src/output/automake.mk
@@ -3,23 +3,16 @@
 
 include $(top_srcdir)/src/output/charts/automake.mk
 
-
-src/output/%: AM_CPPFLAGS += \
-       -I$(top_srcdir)/src/math \
-       -I$(top_srcdir)/src/libpspp \
-       -I$(top_srcdir)/src/data 
-
-noinst_LIBRARIES += src/output/liboutput.a 
-
-
-
+noinst_LTLIBRARIES += src/output/liboutput.la 
 
 output_sources = \
+       src/output/afm.c \
+       src/output/afm.h \
        src/output/ascii.c \
-       src/output/font.h \
-       src/output/groff-font.c \
        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 \
@@ -30,11 +23,13 @@ output_sources = \
 
 
 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 = $(output_sources) src/output/chart.c
+
+EXTRA_DIST += src/output/dummy-chart.c
 else
-src_output_liboutput_a_SOURCES = $(output_sources) src/output/dummy-chart.c
-       EXTRA_DIST += src/output/chart.c
-endif
+src_output_liboutput_la_SOURCES = $(output_sources) src/output/dummy-chart.c
 
+EXTRA_DIST += src/output/chart.c
+endif
 
+EXTRA_DIST += src/output/OChangeLog