X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fautomake.mk;h=522664964c4126bbcce5d387d603fbd197ba02ad;hb=964bc1c0e1b3e490a893583e0598418ce25d5f14;hp=64b4928468c2e84521fb71313e346e8386e9ec66;hpb=1de0159c28b93fdb2f2caac74e13dccbaee00822;p=pspp

diff --git a/src/automake.mk b/src/automake.mk
index 64b4928468..522664964c 100644
--- a/src/automake.mk
+++ b/src/automake.mk
@@ -2,24 +2,42 @@
 
 # PSPP
 
-include $(top_srcdir)/src/ui/terminal/automake.mk
-include $(top_srcdir)/src/math/automake.mk
 include $(top_srcdir)/src/libpspp/automake.mk
 include $(top_srcdir)/src/data/automake.mk
-include $(top_srcdir)/src/output/automake.mk
-include $(top_srcdir)/src/language/automake.mk
 
-if WITHGUI
-include $(top_srcdir)/src/ui/gui/automake.mk
-endif
 
-AM_CPPFLAGS += -DPKGDATADIR=\"$(pkgdatadir)\"
 
-src/procedure.o: AM_CPPFLAGS += \
- -I$(top_srcdir)/src/language \
- -I$(top_srcdir)/src/language/control \
- -I$(top_srcdir)/src/output \
- -I$(top_srcdir)/src/data \
- -I$(top_srcdir)/src/libpspp
+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_LIBADD = \
+	src/data/libdata.la \
+	src/libpspp/libpspp.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 \
+        $(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