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

diff --git a/src/automake.mk b/src/automake.mk
index 741439f988..efbdf72012 100644
--- a/src/automake.mk
+++ b/src/automake.mk
@@ -2,31 +2,38 @@
 
 # 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/message.o: AM_CPPFLAGS += \
- -I$(top_srcdir)/src/language \
- -I$(top_srcdir)/src/language/lexer \
- -I$(top_srcdir)/src/ui/terminal \
- -I$(top_srcdir)/src/data \
- -I$(top_srcdir)/src/libpspp
+AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_srcdir)/lib
+
+
+pkglib_LTLIBRARIES = src/libpspp-core.la src/libpspp.la
+src_libpspp_core_la_SOURCES = 
+
 
-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
+src_libpspp_core_la_LDFLAGS = -release $(VERSION)
 
+src_libpspp_core_la_LIBADD = \
+	src/data/libdata.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 \
+        $(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