X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.am;h=ec592100afc00cafc97f8752fd8c223d7fee86c5;hb=fad826ff86720f76220b05e00dc7dfa46e418859;hp=1a6216d9f224d7f0f3e3b8ecf8ded18a700d336e;hpb=b7852df2743416201dc85fd672644799cdd1b7b5;p=pspp-builds.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 1a6216d9..ec592100 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,37 +2,16 @@
 
 # PSPP
 
+include $(top_srcdir)/src/Make.build
+
+SUBDIRS = expressions
+
 # If you change this, you must also change the corresponding line in 
 # config/Makefile.am
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
 
 bin_PROGRAMS = pspp
 
-
-
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/lib	\
--I$(top_srcdir)/intl 
-
-AM_CFLAGS=
-
-if cc_is_gcc
-AM_CFLAGS+=-Wall -W -Wwrite-strings -Wstrict-prototypes \
--Wpointer-arith -Wno-sign-compare -Wmissing-prototypes \
--ansi 
-endif
-
-if unix
-AM_CFLAGS+=-Dunix
-endif
-
-if msdos
-AM_CFLAGS+=-D__MSDOS__
-endif
-
-
-
-CLEANFILES =  $(q_sources_c) version.c
-DISTCLEANFILES = foo 
 MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = $(q_sources_q) q2c.c
 ETAGS_ARGS = -l c $(q_sources_c)
@@ -45,6 +24,9 @@ $(q_sources_c): q2c$(EXEEXT)
 q_sources_c = correlations.c crosstabs.c examine.c file-handle.c	\
 frequencies.c list.c means.c oneway.c set.c  t-test.c 
 
+CLEANFILES=$(q_sources_c)
+DISTCLEANFILES=version.c
+
 q_sources_q = correlations.q crosstabs.q examine.q file-handle.q	\
 frequencies.q list.q means.q oneway.q set.q  t-test.q
 
@@ -62,14 +44,14 @@ endif
 pspp_SOURCES = $(q_sources_c) $(chart_sources) \
 aggregate.c algorithm.c algorithm.h	\
 alloc.c alloc.h apply-dict.c ascii.c autorecode.c bitvector.h		\
-case.c case.h casefile.c casefile.h chart.c  chart.h  \
-cmdline.c cmdline.h command.c command.def		\
+bool.h \
+calendar.c calendar.h case.c case.h casefile.c casefile.h chart.c	\
+chart.h cmdline.c cmdline.h command.c command.def \
 command.h compute.c copyleft.c copyleft.h count.c data-in.c data-in.h	\
 data-list.c data-list.h data-out.c date.c debug-print.h descript.c	\
 devind.c devind.h dfm-read.c dfm-read.h dfm-write.c dfm-write.h	\
-dictionary.c dictionary.h do-if.c do-ifP.h error.c \
-error.h expr-evl.c expr-opt.c expr-prs.c expr.h exprP.h expr.def        \
-factor_stats.c factor_stats.h file-handle.h	\
+dictionary.c dictionary.h do-if.c do-ifP.h echo.c error.c \
+error.h factor_stats.c factor_stats.h file-handle.h	\
 file-type.c filename.c filename.h flip.c font.h format.c format.def	\
 format.h formats.c get.c getline.c getline.h glob.c glob.h		\
 groff-font.c group.c group.h group_proc.h \
@@ -87,14 +69,20 @@ sfm-read.c sfm-read.h sfm-write.c sfm-write.h sfmP.h som.c som.h	\
 sort.c sort.h split-file.c str.c str.h subclist.c subclist.h \
 sysfile-info.c tab.c tab.h temporary.c stat.h mkfile.c mkfile.h \
 title.c  val.h val-labs.c value-labels.c value-labels.h		\
-var-labs.c var.h vars-atr.c vars-prs.c vector.c version.c version.h	\
+var-display.c \
+var-labs.c var.h vars-atr.c vars-prs.c vector.c version.h	\
 vfm.c vfm.h vfmP.h weight.c 
 
 
-pspp_LDADD = ../lib/julcal/libjulcal.a		\
+pspp_LDADD = \
 	../lib/misc/libmisc.a			\
+	expressions/libexpressions.a		\
+	../lib/gsl-extras/libgsl-extras.a	\
+	-lplot \
 	@LIBINTL@
 
+nodist_pspp_SOURCES = version.c
+
 version.c:
 	echo "#include <config.h>" > version.c
 	echo "#include \"version.h\"" > version.c