dissect-sysfile: Move to new "utilities" directory as "pspp-dump-sav".

[pspp] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e937fa7b612f7de44da463a0c83d129b90926598..bed99f40c9a44a023f0423083e2c3109f60123e2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,15 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-AUTOMAKE_OPTIONS = gnits 1.10 subdir-objects
+AUTOMAKE_OPTIONS = std-options check-news 1.10.1 subdir-objects
 
-SUBDIRS = gl
+SUBDIRS = gl po
 DISTCLEANFILES = ./po/stamp-po xconfigure 
 BUILT_SOURCES =
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/gl \
        -I$(top_builddir)/gl \
-       -DINSTALLDIR=\"$(bindir)\" \
-       -DDOCDIR=\"$(docdir)\"
+       -DINSTALLDIR=\"$(bindir)\"
 
 AM_CFLAGS=
 
@@ -26,14 +25,15 @@ endif
 $(all_q_sources:.q=.c): src/language/lexer/q2c$(EXEEXT_FOR_BUILD)
 all_q_sources =
 
-pkgsysconfdir = $(sysconfdir)/@PACKAGE@
+pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 
 
-EXTRA_DIST = OChangeLog ONEWS config.rpath pspp-mode.el
+EXTRA_DIST = OChangeLog ONEWS pspp-mode.el
 
 CLEANFILES = 
 CLEAN_LOCAL =
 ALL_LOCAL =
+CHECK_LOCAL =
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
 noinst_LIBRARIES=
 noinst_LTLIBRARIES=
@@ -45,6 +45,7 @@ INSTALL_DATA_HOOKS =
 UNINSTALL_DATA_HOOKS =
 PHONY =
 SUFFIXES = .q
+LDADD = gl/libgl.la
 
 generate-changelog:
        if test -d $(top_srcdir)/.git; then                     \
@@ -60,9 +61,9 @@ DIST_HOOKS += generate-changelog
 include $(top_srcdir)/po/automake.mk
 include $(top_srcdir)/lib/automake.mk
 include $(top_srcdir)/doc/automake.mk
-include $(top_srcdir)/config/automake.mk
 include $(top_srcdir)/examples/automake.mk
 include $(top_srcdir)/src/automake.mk
+include $(top_srcdir)/utilities/automake.mk
 
 include $(top_srcdir)/tests/automake.mk
 
@@ -86,6 +87,7 @@ uninstall-hook: $(UNINSTALL_DATA_HOOKS)
 
 clean-local: $(CLEAN_LOCAL)
 all-local: $(ALL_LOCAL)
+check-local: $(CHECK_LOCAL)
 
 # A convenience target to build all the binaries
 programs: $(PROGRAMS)