Merge commit 'origin/stable'

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

diff --git a/src/language/automake.mk b/src/language/automake.mk
index 4b467dedda05ca3d96e93f282b90710b8f53f2bd..4210b7fce45f8f05153f9fd4bd2cd28881255b01 100644 (file)
--- a/src/language/automake.mk
+++ b/src/language/automake.mk
@@ -10,9 +10,13 @@ include $(top_srcdir)/src/language/stats/automake.mk
 include $(top_srcdir)/src/language/data-io/automake.mk
 include $(top_srcdir)/src/language/expressions/automake.mk
 
-noinst_LIBRARIES += src/language/liblanguage.a
+noinst_LTLIBRARIES +=  src/language/liblanguage.la
 
-src_language_liblanguage_a_SOURCES = \
+
+src_language_liblanguage_la_LIBADD = \
+       src/output/charts/libcharts.la
+
+src_language_liblanguage_la_SOURCES = \
        src/language/syntax-file.c \
        src/language/syntax-file.h \
        src/language/syntax-string-source.c \
@@ -33,10 +37,11 @@ src_language_liblanguage_a_SOURCES = \
        $(language_expressions_sources)
 
 
-
-nodist_src_language_liblanguage_a_SOURCES = \
+nodist_src_language_liblanguage_la_SOURCES = \
        $(src_language_data_io_built_sources) \
        $(src_language_utilities_built_sources) \
        $(src_language_stats_built_sources)  \
        $(language_tests_built_sources) \
        $(expressions_built_sources)
+
+EXTRA_DIST += src/language/OChangeLog