X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.am;h=6f03ed9115be0292c2ee2c65c6becc857a86a3bc;hb=843e8862e77bcc2813a944b6feb524ea6cc2ab6a;hp=2957ac492d865085e2185e9200fc3535ccb6147b;hpb=2bfc3a138f308ffb38634a92b23bdc7b62592324;p=pspp-builds.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 2957ac49..6f03ed91 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,16 +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
-
-DISTCLEANFILES = foo $(q_sources_c)
 MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = $(q_sources_q) q2c.c
 ETAGS_ARGS = -l c $(q_sources_c)
@@ -21,39 +21,70 @@ $(q_sources_c): q2c$(EXEEXT)
 .q.c:
 	./q2c $< $@
 
-q_sources_c = correlations.c crosstabs.c descript.c file-handle.c	\
-frequencies.c list.c means.c set.c t-test.c
-
-q_sources_q = correlations.q crosstabs.q descript.q file-handle.q	\
-frequencies.q list.q means.q set.q t-test.q
-
-pspp_SOURCES = aggregate.c algorithm.c algorithm.h alloc.c alloc.h	\
-apply-dict.c approx.h ascii.c autorecode.c bitvector.h cases.c cases.h	\
-cmdline.c command.c command.def command.h compute.c correlations.c	\
-count.c crosstabs.c data-in.c data-in.h data-list.c data-out.c		\
-debug-print.h descript.c dfm.c dfm.h do-if.c do-ifP.h error.c error.h	\
-expr-evl.c expr-opt.c expr-prs.c expr.h exprP.h file-handle.c		\
-file-handle.h file-type.c filename.c filename.h flip.c font.h format.c	\
-format.def format.h formats.c frequencies.c get.c getline.c getline.h	\
-glob.c groff-font.c hash.c hash.h heap.c heap.h html.c htmlP.h		\
-include.c inpt-pgm.c inpt-pgm.h lexer.c lexer.h list.c log.h loop.c	\
-magic.c magic.h main.c main.h matrix-data.c matrix.c matrix.h means.c	\
-mis-val.c misc.c misc.h modify-vars.c numeric.c output.c output.h	\
-pfm-read.c pfm-write.c pfm.h pool.c pool.h postscript.c print.c		\
-random.c random.h recode.c rename-vars.c repeat.c sample.c sel-if.c	\
-set.c settings.h sfm-read.c sfm-write.c sfm.h sfmP.h som.c som.h	\
-sort.c sort.h split-file.c stat.h stats.c stats.h str.c str.h		\
-sysfile-info.c tab.c tab.h temporary.c title.c t-test.c val-labs.c	\
-value-labels.c value-labels.h var-labs.c var.h vars-atr.c vars-prs.c	\
-vector.c vector.h version.c version.h vfm.c vfm.h vfmP.h weight.c
-
-pspp_LDADD =	../lib/julcal/libjulcal.a		\
+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
+
+if WITHCHARTS
+chart_sources = barchart.c \
+	box-whisker.c \
+	cartesian.c \
+	plot-chart.c \
+	plot-hist.c \
+	piechart.c 
+else
+chart_sources = dummy-chart.c
+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		\
+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 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 \
+hash.c hash.h histogram.c histogram.h \
+html.c htmlP.h include.c inpt-pgm.c lexer.c lexer.h levene.c levene.h \
+linked-list.c linked-list.h log.h loop.c magic.c magic.h main.c main.h	\
+matrix-data.c mis-val.c misc.c misc.h modify-vars.c			\
+moments.c moments.h numeric.c output.c output.h \
+percentiles.c percentiles.h permissions.c \
+pfm-read.c pfm-read.h	\
+pfm-write.c pfm-write.h \
+pool.c pool.h postscript.c print.c recode.c	\
+rename-vars.c repeat.c repeat.h sample.c sel-if.c settings.h		\
+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.h	\
+vfm.c vfm.h vfmP.h weight.c 
+
+
+pspp_LDADD = \
 	../lib/misc/libmisc.a			\
-	../lib/dcdflib/libdcdflib.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
 	echo "const char bare_version[] = \"@VERSION@\";" >> version.c
 	echo "const char version[] = \"GNU @PACKAGE@ @VERSION@\";" >> version.c
 	echo "const char stat_version[] = \"GNU @PACKAGE@ @VERSION@ \