X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fautomake.mk;h=efbdf720126cfdb0b8b1e13ffa7d1b3a4ae487e7;hb=refs%2Fheads%2Fdataset;hp=56f7590410f8d042761b9cdbf64949d219c4c669;hpb=a1efcf97ca2f75f4be6a0389ff2372c03ed2d4e1;p=pspp

diff --git a/src/automake.mk b/src/automake.mk
index 56f7590410..efbdf72012 100644
--- a/src/automake.mk
+++ b/src/automake.mk
@@ -7,37 +7,33 @@ 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
+pkglib_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/libpspp.la \
+	src/libpspp/liblibpspp.la \
 	$(LIBXML2_LIBS) $(PG_LIBS) \
 	gl/libgl.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 \
-	gl/libgl.la
-
+        $(GSL_LIBS)
 
 include $(top_srcdir)/src/math/automake.mk
 include $(top_srcdir)/src/output/automake.mk
 include $(top_srcdir)/src/language/automake.mk
 include $(top_srcdir)/src/ui/automake.mk
-
-
-
-EXTRA_DIST += src/OChangeLog