X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.am;h=72731c98c7b2e5df7f3f9e2fff1165a0ecfac87b;hb=f474cf35ed7d1a6374f187fb6ea4a32e00d0fa44;hp=c684fe5f970c5d95025f35311b8dca4bd1e36344;hpb=b18e1b9c95a478d434e9fcef9d8579d0b96b9a8d;p=pspp-builds.git

diff --git a/src/Makefile.am b/src/Makefile.am
index c684fe5f..72731c98 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,58 +2,256 @@
 
 # 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
 
-INCLUDES = -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)
 SUFFIXES = .q
 
-$(q_sources_c): q2c
+$(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 alloc.c alloc.h apply-dict.c approx.h	\
-ascii.c autorecode.c avl.c avl.h 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 frequencies.g 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 quicksort.c quicksort.h 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 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
-
-LDADD =	../lib/julcal/libjulcal.a		\
-	../lib/misc/libmisc.a			\
-	../lib/dcdflib/libdcdflib.a		\
+q_sources_c = 					\
+	correlations.c				\
+	crosstabs.c				\
+	examine.c				\
+	file-handle.c				\
+	frequencies.c				\
+	list.c					\
+	means.c					\
+	oneway.c				\
+	rank.c					\
+	regression.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				\
+	rank.q					\
+	regression.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				\
+	calendar.c				\
+	calendar.h				\
+	case.c					\
+	case.h					\
+	casefile.c				\
+	casefile.h				\
+	cat.c					\
+	cat.h					\
+	cat-routines.h				\
+	chart.c					\
+	chart.h					\
+	ctl-stack.c				\
+	ctl-stack.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				\
+	design-matrix.h				\
+	design-matrix.c				\
+	dfm-read.c				\
+	dfm-read.h				\
+	dfm-write.c				\
+	dfm-write.h				\
+	dictionary.c				\
+	dictionary.h				\
+	do-if.c					\
+	echo.c					\
+	error.c					\
+	error.h					\
+	factor_stats.c				\
+	factor_stats.h				\
+	file-handle-def.c			\
+	file-handle-def.h			\
+	file-handle.h				\
+	file-type.c				\
+	filename.c				\
+	filename.h				\
+	flip.c					\
+	font.h					\
+	format.c				\
+	format-prs.c				\
+	format.def				\
+	format.h				\
+	formats.c				\
+	get.c					\
+	getl.c					\
+	getl.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					\
+	lex-def.h				\
+	lex-def.c				\
+	levene.c				\
+	levene.h				\
+	linked-list.c				\
+	linked-list.h				\
+	loop.c					\
+	magic.c					\
+	magic.h					\
+	main.c					\
+	main.h					\
+	matrix-data.c				\
+	mis-val.c				\
+	misc.c					\
+	misc.h					\
+	missing-values.c			\
+	missing-values.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					\
+	random.c				\
+	random.h				\
+	range-prs.c				\
+	range-prs.h				\
+	readln.c				\
+	readln.h				\
+	recode.c				\
+	rename-vars.c				\
+	regression_export.h			\
+	repeat.c				\
+	repeat.h				\
+	sample.c				\
+	sel-if.c				\
+	settings.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					\
+	sort-prs.c				\
+	sort-prs.h				\
+	split-file.c				\
+	str.c					\
+	str.h					\
+	subclist.c				\
+	subclist.h				\
+	sysfile-info.c				\
+	tab.c					\
+	tab.h					\
+	temporary.c				\
+	mkfile.c				\
+	mkfile.h				\
+	title.c					\
+	val.h					\
+	val-labs.c				\
+	value-labels.c				\
+	value-labels.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 =					\
+	expressions/libexpressions.a		\
+	../lib/gsl-extras/libgsl-extras.a	\
+	../lib/linreg/liblinreg.a		\
+	../gl/libgl.a				\
 	@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@ \
@@ -71,7 +269,6 @@ version.c:
 	echo "	\"/usr/local/share/groff/font:\" \\" >> version.c
 	echo "	\"/usr/share/groff/font\";" >> version.c
 	echo "const char locale_dir[] = \"$(datadir)/locale\";" >> version.c
-
 
 noinst_PROGRAMS = q2c
 q2c_SOURCES = q2c.c