X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=6cffa402776cf5f4fb5f8f5064d64edada8f74ba;hb=0655c32db3a849462fbcebd73d8c659d814e794d;hp=4fb848d2621ab33e748a4d5538f700736874eb0f;hpb=66b1b93cf6ca53c86199e88e5972f3017c56314c;p=pspp-builds.git

diff --git a/Makefile.am b/Makefile.am
index 4fb848d2..6cffa402 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,12 +25,15 @@ 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=
@@ -37,9 +41,11 @@ noinst_PROGRAMS=
 check_PROGRAMS=
 bin_PROGRAMS=
 DIST_HOOKS =
+INSTALL_DATA_HOOKS = 
+UNINSTALL_DATA_HOOKS =
 PHONY =
+SUFFIXES = .q
 
-DIST_HOOKS += generate-changelog
 generate-changelog:
 	if test -d $(top_srcdir)/.git; then			\
 	  $(top_srcdir)/gitlog-to-changelog --since=2008-07-27	\
@@ -48,9 +54,12 @@ generate-changelog:
 	  mv $(distdir)/cl-t $(distdir)/ChangeLog;		\
 	fi
 
+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
 
@@ -60,8 +69,23 @@ if WITH_GUI_TOOLS
 include $(top_srcdir)/glade/automake.mk
 endif
 
+if WITH_PERL_MODULE
 include $(top_srcdir)/perl-module/automake.mk
+endif
+
+PHONY += $(DIST_HOOKS) $(INSTALL_DATA_HOOKS) $(UNINSTALL_DATA_HOOKS)
 
-PHONY += $(DIST_HOOKS)
-dist-hook: $(DIST_HOOKS)
 .PHONY: $(PHONY)
+
+dist-hook: $(DIST_HOOKS)
+
+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)