Tweaked some things so that make distcheck passes

[pspp-builds.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 01d651d4f5fc22ba2c0f8279a20a294540ef8a69..1dac4987485ca6f1c91cddf8a6d1f0948f8c9f1d 100644 (file)
--- 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,20 +44,20 @@ 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    \
+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 log.h loop.c magic.c magic.h main.c main.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 \
@@ -87,14 +69,18 @@ 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-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            \
+       -lplot \
        @LIBINTL@
 
+nodist_pspp_SOURCES = version.c
+
 version.c:
        echo "#include <config.h>" > version.c
        echo "#include \"version.h\"" > version.c