Sat Dec 27 16:16:49 2003 Ben Pfaff <blp@gnu.org>

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

diff --git a/src/Makefile.am b/src/Makefile.am
index fc07853268ccb05de2c8665c1245f8049333d346..906f25cd1e02b770a6f5236f5151c9916810dabd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,9 +2,13 @@
 
 # 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     \
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/lib  \
 -I$(top_srcdir)/intl
 
 DISTCLEANFILES = foo $(q_sources_c)
@@ -13,7 +17,7 @@ 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 $< $@
 
@@ -23,36 +27,38 @@ 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 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
+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 cmdline.h 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 dictionary.c 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 glob.h groff-font.c hash.c hash.h     \
+heap.c heap.h html.c htmlP.h include.c inpt-pgm.c 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 \
+repeat.h 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 version.c version.h vfm.c vfm.h vfmP.h  \
+weight.c
 
-LDADD =        ../lib/julcal/libjulcal.a               \
+pspp_LDADD =   ../lib/julcal/libjulcal.a               \
        ../lib/misc/libmisc.a                   \
        ../lib/dcdflib/libdcdflib.a             \
        @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