Merge remote-tracking branch 'origin/master' into sheet

[pspp] / src / math / automake.mk

diff --git a/src/math/automake.mk b/src/math/automake.mk
index cadfb90079ebf429083edede4d7cfbb9ec4a8f8f..36e1f5e3043e8e8acf2b4c0b709235a4abde2c63 100644 (file)
--- a/src/math/automake.mk
+++ b/src/math/automake.mk
@@ -1,24 +1,39 @@
+# PSPP - a program for statistical analysis.
+# Copyright (C) 2017 Free Software Foundation, Inc.
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-include $(top_srcdir)/src/math/ts/automake.mk
 
 noinst_LTLIBRARIES += src/math/libpspp-math.la
 
 src_math_libpspp_math_la_LIBADD = \
-       lib/linreg/liblinreg.la
+       lib/linreg/liblinreg.la \
+       lib/tukey/libtukey.la
 
 src_math_libpspp_math_la_SOURCES = \
        src/math/chart-geometry.c \
        src/math/chart-geometry.h \
        src/math/box-whisker.c src/math/box-whisker.h \
-       src/math/coefficient.c \
-       src/math/coefficient.h \
-       src/math/covariance-matrix.c \
-       src/math/covariance-matrix.h \
-       src/math/design-matrix.c src/math/design-matrix.h \
+       src/math/categoricals.h \
+       src/math/categoricals.c \
+       src/math/covariance.c \
+       src/math/covariance.h \
+       src/math/correlation.c \
+       src/math/correlation.h \
        src/math/extrema.c src/math/extrema.h \
-       src/math/group.c  src/math/group.h \
-       src/math/group-proc.h \
        src/math/histogram.c src/math/histogram.h \
        src/math/interaction.c src/math/interaction.h \
        src/math/levene.c src/math/levene.h \