X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.am;h=ec5ce0aeb155197614b6bdd7557eb66e48ce6a9b;hb=b321086267ad1014dc5d09886396cde30f094437;hp=87061dd8b60691dfd2b5107a76ecdf707d8755d4;hpb=4944c86a9318bc5b5578ab145a95c116ffd2c9fd;p=pspp

diff --git a/src/Makefile.am b/src/Makefile.am
index 87061dd8b6..ec5ce0aeb1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,61 +2,98 @@
 
 # PSPP
 
+# 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)
+
+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)
 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_c = correlations.c crosstabs.c examine.c file-handle.c	\
+frequencies.c list.c means.c oneway.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
+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
 
-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	\
+pspp_SOURCES = $(q_sources_c) 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 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	\
 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 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
-
-GMP_LIBS = ../lib/gmp/mpf/libmpf.a			\
-	../lib/gmp/mpn/libmpn.a			\
-	../lib/gmp/libgmp.a
-
-LDADD =	../lib/julcal/libjulcal.a		\
+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 html.c htmlP.h include.c inpt-pgm.c lexer.c	\
+lexer.h levene.c levene.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 pfm-read.c pfm-read.h	\
+pfm-write.c pfm-write.h \
+pool.c pool.h postscript.c print.c random.c random.h 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 \
+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	\
+vfm.c vfm.h vfmP.h weight.c \
+barchart.c \
+box-whisker.c \
+cartesian.c \
+chart.c \
+chart.h \
+histogram.c \
+piechart.c 
+
+pspp_LDADD = ../lib/julcal/libjulcal.a		\
 	../lib/misc/libmisc.a			\
-	../lib/dcdflib/libdcdflib.a		\
-	@GMP_LIBS@ @INTLLIBS@
+	-lplot \
+	@LIBINTL@
 
 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@ \
+	echo "const char version[] = \"GNU @PACKAGE@ @VERSION@\";" >> version.c
+	echo "const char stat_version[] = \"GNU @PACKAGE@ @VERSION@ \
 (`date`).\";" >> version.c
 	echo "const char host_system[] = \"$(host_triplet)\";" >> version.c
 	echo "const char build_system[] = \"$(build_triplet)\";" >> version.c
@@ -72,16 +109,6 @@ version.c:
 	echo "	\"/usr/share/groff/font\";" >> version.c
 	echo "const char locale_dir[] = \"$(datadir)/locale\";" >> version.c
 
-# q2c
 
-LOCAL_CC = @LOCAL_CC@
-LOCAL_COMPILE = $(LOCAL_CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LOCAL_LINK = $(LOCAL_CC) $(LDFLAGS) -o $@
-
-q2c.o: q2c.c
-	$(LOCAL_COMPILE) $< -o q2c.o
-q2c: q2c.o
-	$(LOCAL_LINK) q2c.o ../lib/misc/libmisc.a -o q2c
-
-CLEANFILES = q2c
-MAINTAINERCLEANFILES = Makefile.in
+noinst_PROGRAMS = q2c
+q2c_SOURCES = q2c.c