Merge commit 'origin/stable'

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

diff --git a/src/output/charts/automake.mk b/src/output/charts/automake.mk
index af24ef49e461c80df91a06d40c01a96556e4b666..ab0ff51047a4ffeb608770c3b088df8843077204 100644 (file)
--- a/src/output/charts/automake.mk
+++ b/src/output/charts/automake.mk
@@ -1,15 +1,6 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-
-
-noinst_LIBRARIES += src/output/charts/libcharts.a
-
-
-src/output/charts/%: AM_CPPFLAGS +=  \
-       -I$(top_srcdir)/src/libpspp \
-       -I$(top_srcdir)/src/output \
-       -I$(top_srcdir)/src/data \
-       -I$(top_srcdir)/src/math
+noinst_LTLIBRARIES += src/output/charts/libcharts.la
 
 chart_sources = \
        src/output/charts/barchart.c \
@@ -26,12 +17,12 @@ chart_sources = \
        src/output/charts/plot-hist.h
 
 if WITHCHARTS
-src_output_charts_libcharts_a_SOURCES = \
+src_output_charts_libcharts_la_SOURCES = \
        $(chart_sources)
 
 EXTRA_DIST += src/output/charts/dummy-chart.c
 else
-src_output_charts_libcharts_a_SOURCES =  \
+src_output_charts_libcharts_la_SOURCES =  \
        src/output/charts/dummy-chart.c
 
 EXTRA_DIST += $(chart_sources)
@@ -39,3 +30,5 @@ EXTRA_DIST += $(chart_sources)
 AM_CPPFLAGS += -DNO_CHARTS
 
 endif
+
+EXTRA_DIST += src/output/charts/OChangeLog