sweep.c: Move repeated call out of if ... else

[pspp-builds.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0022e1d70c4f785268868e2bc72455c8302e452b..28e9ffc6b250078acdc65da2ddebfc1bfee5dd52 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.1 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=
 
@@ -29,7 +28,7 @@ all_q_sources =
 pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 
 
-EXTRA_DIST = OChangeLog ONEWS config.rpath pspp-mode.el
+EXTRA_DIST = OChangeLog ONEWS pspp-mode.el
 
 CLEANFILES = 
 CLEAN_LOCAL =
@@ -46,10 +45,11 @@ INSTALL_DATA_HOOKS =
 UNINSTALL_DATA_HOOKS =
 PHONY =
 SUFFIXES = .q
+LDADD = gl/libgl.la
 
 generate-changelog:
        if test -d $(top_srcdir)/.git; then                     \
-         $(top_srcdir)/gitlog-to-changelog --since=2008-07-27  \
+         $(top_srcdir)/build-aux/gitlog-to-changelog --since=2008-07-27        \
            > $(distdir)/cl-t;                                  \
          rm -f $(distdir)/ChangeLog;                           \
          mv $(distdir)/cl-t $(distdir)/ChangeLog;              \
@@ -61,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