Name the src/libpspp convenience library consistently.

[pspp] / src / automake.mk

diff --git a/src/automake.mk b/src/automake.mk
index 46e0ef73403f1cbd7dd097c0361b692c6aeaaff9..3f56eb5c792289e1aad567cb5492ee963ce2fe39 100644 (file)
--- a/src/automake.mk
+++ b/src/automake.mk
@@ -7,7 +7,7 @@ include $(top_srcdir)/src/data/automake.mk
 
 
 
-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
@@ -18,20 +18,20 @@ src_libpspp_core_la_LDFLAGS = -release $(VERSION)
 
 src_libpspp_core_la_LIBADD = \
        src/data/libdata.la \
-       src/libpspp/libpspp.la \
+       src/libpspp/liblibpspp.la \
        $(LIBXML2_LIBS) $(PG_LIBS) \
        gl/libgl.la
 
 src_libpspp_la_SOURCES = 
 
+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 \
-       gl/libgl.la
-
+        $(GSL_LIBS)
 
 include $(top_srcdir)/src/math/automake.mk
 include $(top_srcdir)/src/output/automake.mk