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

diff --git a/src/automake.mk b/src/automake.mk
index f709b8de..56f75904 100644
--- a/src/automake.mk
+++ b/src/automake.mk
@@ -2,56 +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
+
+
+
+AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_srcdir)/lib -DPKGDATADIR=\"$(pkgdatadir)\"
+
+
+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_LDFLAGS = -release @VERSION@
+
+src_libpspp_la_LIBADD = \
+	src/language/liblanguage.la \
+	src/math/libpspp-math.la \
+	src/output/liboutput.la \
+	gl/libgl.la
+
+
+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
+
 
-if WITHGUI
-include $(top_srcdir)/src/ui/gui/automake.mk
-endif
-
-
-src/%: AM_CPPFLAGS += \
- -I$(top_srcdir)/src/math  \
- -I$(top_srcdir)/src/ui/terminal \
- -I$(top_srcdir)/src/libpspp \
- -I$(top_srcdir)/src/data \
- -I$(top_srcdir)/src/output \
- -I$(top_srcdir)/src/language \
- -I$(top_srcdir)/src/language/lexer \
- -I$(top_srcdir)/src/language/control
-
-
-bin_PROGRAMS += src/pspp
-
-src_pspp_SOURCES =					\
-	src/message.c					\
-	src/procedure.c  src/procedure.h 
-
-src_pspp_LDADD =					\
-	$(top_builddir)/src/language/expressions/libexpressions.a		\
-	$(top_builddir)/src/language/liblanguage.a \
-	$(top_builddir)/src/language/tests/libtests.a \
-	$(top_builddir)/src/language/utilities/libutilities.a \
-	$(top_builddir)/src/language/control/libcontrol.a \
-	$(top_builddir)/src/language/stats/libstats.a \
-	$(top_builddir)/src/language/xforms/libxforms.a \
-	$(top_builddir)/src/language/dictionary/libcmddict.a \
-	$(top_builddir)/src/language/lexer/liblexer.a \
-	$(top_builddir)/src/language/data-io/libdata_io.a \
- 	$(top_builddir)/src/output/charts/libcharts.a \
- 	$(top_builddir)/src/output/liboutput.a \
-	$(top_builddir)/src/math/libpspp_math.a  \
-	$(top_builddir)/src/math/linreg/libpspp_linreg.a  \
-	$(top_builddir)/src/ui/terminal/libui.a \
-	$(top_builddir)/lib/linreg/liblinreg.a	\
-	$(top_builddir)/lib/gsl-extras/libgsl-extras.a	\
-	$(top_builddir)/src/data/libdata.a \
-	$(top_builddir)/src/libpspp/libpspp.a \
-	$(top_builddir)/gl/libgl.a	\
-	@LIBINTL@ @LIBREADLINE@
-	
 
+EXTRA_DIST += src/OChangeLog