X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fautomake.mk;h=522664964c4126bbcce5d387d603fbd197ba02ad;hb=44bce70de3a7d3c2787d0d5cb0b452b5191b38fd;hp=56f7590410f8d042761b9cdbf64949d219c4c669;hpb=c3ac5a8af9c449072c7e872ca70a78c1755ae309;p=pspp-builds.git

diff --git a/src/automake.mk b/src/automake.mk
index 56f75904..52266496 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,14 +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 \
-	gl/libgl.la
-
+        $(GSL_LIBS)
 
 include $(top_srcdir)/src/math/automake.mk
 include $(top_srcdir)/src/output/automake.mk