Fixed another problem with print.sh

[pspp] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 87061dd8b60691dfd2b5107a76ecdf707d8755d4..005ae68541b2cf9278cc7ca616ef4121634b4c3d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,10 @@
 
 # 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     \
@@ -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 $< $@
 
@@ -36,27 +40,23 @@ 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
+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             \
-       @GMP_LIBS@ @INTLLIBS@
+       @LIBINTL@
 
 version.c:
        echo "#include <config.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 +72,6 @@ version.c:
        echo "  \"/usr/share/groff/font\";" >> version.c
        echo "const char locale_dir[] = \"$(datadir)/locale\";" >> version.c
 \f
-# 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