Update build system to Autoconf 2.58, Automake 1.7, gettext 0.12.1.

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 87061dd8b60691dfd2b5107a76ecdf707d8755d4..fc07853268ccb05de2c8665c1245f8049333d346 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,14 +43,10 @@ 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               \
        ../lib/misc/libmisc.a                   \
        ../lib/dcdflib/libdcdflib.a             \
-       @GMP_LIBS@ @INTLLIBS@
+       @LIBINTL@
 
 version.c:
        echo "#include <config.h>" > version.c
@@ -72,16 +68,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