-AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_srcdir)/lib -DPKGDATADIR=\"$(pkgdatadir)\"
+AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_srcdir)/lib
lib_LTLIBRARIES = src/libpspp-core.la src/libpspp.la
src_libpspp_core_la_SOURCES =
-src_libpspp_core_la_LDFLAGS = -release @VERSION@
+src_libpspp_core_la_LDFLAGS = -release $(VERSION)
src_libpspp_core_la_LIBADD = \
src/data/libdata.la \
src_libpspp_la_SOURCES =
-src_libpspp_la_LDFLAGS = -release @VERSION@
+src_libpspp_la_CFLAGS = $(GSL_CFLAGS)
+src_libpspp_la_LDFLAGS = -release $(VERSION)
src_libpspp_la_LIBADD = \
src/language/liblanguage.la \
src/math/libpspp-math.la \
src/output/liboutput.la \
+ $(GSL_LIBS) \
gl/libgl.la