X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=blobdiff_plain;f=Makefile.am;h=48ec5073668fc7681f803ff0ae9a686d82c02e56;hp=f606cbf1123b5d8c8d8f468fd6fadb90dc1c2512;hb=refs%2Fheads%2Flexer;hpb=8af88c0b7ea2fe75df7e45497988ed0371006a86

diff --git a/Makefile.am b/Makefile.am
index f606cbf112..48ec507366 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +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 po
 DISTCLEANFILES = ./po/stamp-po xconfigure 
 BUILT_SOURCES =
 
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/gl \
+	-I$(top_builddir)/gl \
+	-DINSTALLDIR=\"$(bindir)\"
 
 AM_CFLAGS=
 
@@ -15,8 +18,6 @@ AM_CFLAGS+=-Wall -W -Wwrite-strings -Wstrict-prototypes \
 -Wpointer-arith -Wno-sign-compare -Wmissing-prototypes
 endif
 
-CC_FOR_BUILD = @CC_FOR_BUILD@
-EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 .q.c:
 	@$(MKDIR_P) `dirname $@`
 	./src/language/lexer/q2c$(EXEEXT_FOR_BUILD) $< $@
@@ -24,26 +25,32 @@ EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 $(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=
 noinst_PROGRAMS=
 check_PROGRAMS=
 bin_PROGRAMS=
+dist_man_MANS =
 DIST_HOOKS =
 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;		\
@@ -52,11 +59,12 @@ generate-changelog:
 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
 
@@ -78,5 +86,9 @@ install-data-hook: $(INSTALL_DATA_HOOKS)
 
 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)