rte/ordrules/Makefile.am: moved version.lisp from CLEANFILES to DISTCLEANFILES,

  otherwise rebuild was failing after "make clean"

rte/Makefile.am: changed to not rebuild ordrules (and xindy.run, base.mem)
  on every "make" run if it is already built


git-svn-id: svn://tug.org/texlive/trunk@7222 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 11 insertions, 4 deletions

diff --git a/Build/source/utils/xindy/rte/Makefile.am b/Build/source/utils/xindy/rte/Makefile.am
index f7c67dbb153..291efd036bb 100644
--- a/Build/source/utils/xindy/rte/Makefile.am
+++ b/Build/source/utils/xindy/rte/Makefile.am
@@ -27,7 +27,9 @@ EXTRA_DIST = NEWS README
 ORDRULES_FILES = ordrules.c ordrules.h rxsub.c rxsub.h mkind.h debug.h link.sh
 binariesdir = ../binaries
 
-all-local:
+all-local: $(binariesdir)/xindy.run $(binariesdir)/base.mem
+
+$(binariesdir)/xindy.run $(binariesdir)/base.mem: 
 	rm -rf xindy-build-dir
 	test -f ordrules/link.sh || for i in $(ORDRULES_FILES); do cp -p $(top_srcdir)/rte/ordrules/$$i ordrules/$$i; done
 	$(MAKE) -C ordrules ordrulei.c
diff --git a/Build/source/utils/xindy/rte/Makefile.in b/Build/source/utils/xindy/rte/Makefile.in
index 3acf0e948c4..55b48fa0a35 100644
--- a/Build/source/utils/xindy/rte/Makefile.in
+++ b/Build/source/utils/xindy/rte/Makefile.in
@@ -466,7 +466,9 @@ uninstall-am:
 	tags-recursive uninstall uninstall-am
 
 
-all-local:
+all-local: $(binariesdir)/xindy.run $(binariesdir)/base.mem
+
+$(binariesdir)/xindy.run $(binariesdir)/base.mem: 
 	rm -rf xindy-build-dir
 	test -f ordrules/link.sh || for i in $(ORDRULES_FILES); do cp -p $(top_srcdir)/rte/ordrules/$$i ordrules/$$i; done
 	$(MAKE) -C ordrules ordrulei.c
diff --git a/Build/source/utils/xindy/rte/ordrules/Makefile.am b/Build/source/utils/xindy/rte/ordrules/Makefile.am
index ebb3316f216..1d496455928 100644
--- a/Build/source/utils/xindy/rte/ordrules/Makefile.am
+++ b/Build/source/utils/xindy/rte/ordrules/Makefile.am
@@ -41,5 +41,6 @@ clisp-module: ordrulei.o ordrules.o rxsub.o
 
 EXTRA_DIST = ordrulei.lsp ordrules.c ordrules.h rxsub.c rxsub.h mkind.h debug.h link.sh
 
-CLEANFILES = ordrulei.c ordrulei.fas ordrulei.lib ordrulei.o ordrules.o rxsub.o version.lisp
+CLEANFILES = ordrulei.c ordrulei.fas ordrulei.lib ordrulei.o ordrules.o rxsub.o
 
+DISTCLEANFILES = version.lisp
diff --git a/Build/source/utils/xindy/rte/ordrules/Makefile.in b/Build/source/utils/xindy/rte/ordrules/Makefile.in
index d7cc5143cdc..b1c66885a5c 100644
--- a/Build/source/utils/xindy/rte/ordrules/Makefile.in
+++ b/Build/source/utils/xindy/rte/ordrules/Makefile.in
@@ -149,7 +149,8 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INCLUDES = 
 EXTRA_DIST = ordrulei.lsp ordrules.c ordrules.h rxsub.c rxsub.h mkind.h debug.h link.sh
-CLEANFILES = ordrulei.c ordrulei.fas ordrulei.lib ordrulei.o ordrules.o rxsub.o version.lisp
+CLEANFILES = ordrulei.c ordrulei.fas ordrulei.lib ordrulei.o ordrules.o rxsub.o
+DISTCLEANFILES = version.lisp
 all: all-am
 
 .SUFFIXES:
@@ -242,6 +243,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"