X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fautomake.mk;h=efbdf720126cfdb0b8b1e13ffa7d1b3a4ae487e7;hb=5b5099296b3c7212623991de8920e1459e234922;hp=46e0ef73403f1cbd7dd097c0361b692c6aeaaff9;hpb=d94dc663529b4e05ec1e7c47c1e73310abb1d3b4;p=pspp

diff --git a/src/automake.mk b/src/automake.mk
index 46e0ef7340..efbdf72012 100644
--- a/src/automake.mk
+++ b/src/automake.mk
@@ -7,10 +7,10 @@ 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 = 
 
 
@@ -18,26 +18,22 @@ 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
 include $(top_srcdir)/src/language/automake.mk
 include $(top_srcdir)/src/ui/automake.mk
-
-
-
-EXTRA_DIST += src/OChangeLog