X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fautomake.mk;h=cfd3a9f5a8114acebd63f6d7f63c8a28534250f0;hb=5f68c60b8283f6a410de20f927e9b12792ea58b3;hp=56f7590410f8d042761b9cdbf64949d219c4c669;hpb=14aac9fe7a7efbb6c9bded2ed5969a643cb76645;p=pspp

diff --git a/src/automake.mk b/src/automake.mk
index 56f7590410..cfd3a9f5a8 100644
--- a/src/automake.mk
+++ b/src/automake.mk
@@ -7,14 +7,14 @@ 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
 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 \
@@ -24,12 +24,14 @@ src_libpspp_core_la_LIBADD = \
 
 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