From 60c9906bf7ba1dfc3f8739a3dd9ab1ceb1dd37ef Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Sun, 27 Jan 2013 13:15:34 +0100
Subject: moved redundant code related to bootstrapping and teco-driven
 substitutions into automake include (bootstrap.am)

---
 Makefile.am     | 18 +-----------------
 bootstrap.am    | 17 +++++++++++++++++
 doc/Makefile.am | 17 +----------------
 src/Makefile.am |  5 ++---
 4 files changed, 21 insertions(+), 36 deletions(-)
 create mode 100644 bootstrap.am

diff --git a/Makefile.am b/Makefile.am
index ac220c3..db0a39b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,7 @@
+include $(top_srcdir)/bootstrap.am
 
 SUBDIRS = src doc
 
-if BOOTSTRAP
-BOOTSTRAP_SCITECO = src/sciteco-minimal$(EXEEXT)
-else
-BOOTSTRAP_SCITECO = @SCITECO@
-endif
-REPL_MACRO = eb$<\e \
-	     <fs@PACKAGE^Q@\e@PACKAGE@\e;>j \
-	     <fs@PACKAGE_NAME^Q@\e@PACKAGE_NAME@\e;>j \
-	     <fs@PACKAGE_VERSION^Q@\e@PACKAGE_VERSION@\e;>j \
-	     <fs@PACKAGE_URL^Q@\e@PACKAGE_URL@\e;>j \
-	     <fs@pkgdatadir^Q@\e$(pkgdatadir)\e;>j \
-	     <fs@DATE^Q@\e$(shell @DATE@ "+%d %b %Y")\e;>j \
-	     ew$@\e
-
 pkgdata_DATA = teco.ini
 EXTRA_DIST = teco.ini.in
 CLEANFILES = teco.ini
@@ -27,6 +14,3 @@ noinst_HEADERS = compat/bsd/sys/cdefs.h \
 EXTRA_DIST += patches/scintilla-teco-control-codes.patch
 
 EXTRA_DIST += TODO
-
-% : %.in
-	$(BOOTSTRAP_SCITECO) -e $$'$(REPL_MACRO)'
diff --git a/bootstrap.am b/bootstrap.am
new file mode 100644
index 0000000..21f4b51
--- /dev/null
+++ b/bootstrap.am
@@ -0,0 +1,17 @@
+if BOOTSTRAP
+BOOTSTRAP_SCITECO = $(top_srcdir)/src/sciteco-minimal$(EXEEXT)
+else
+BOOTSTRAP_SCITECO = @SCITECO@
+endif
+
+SUBST_MACRO = eb$<\e \
+	      <fs@PACKAGE^Q@\e@PACKAGE@\e;>j \
+	      <fs@PACKAGE_NAME^Q@\e@PACKAGE_NAME@\e;>j \
+	      <fs@PACKAGE_VERSION^Q@\e@PACKAGE_VERSION@\e;>j \
+	      <fs@PACKAGE_URL^Q@\e@PACKAGE_URL@\e;>j \
+	      <fs@pkgdatadir^Q@\e$(pkgdatadir)\e;>j \
+	      <fs@DATE^Q@\e$(shell @DATE@ "+%d %b %Y")\e;>j \
+	      ew$@\e
+
+% : %.in
+	$(BOOTSTRAP_SCITECO) -e $$'$(SUBST_MACRO)'
diff --git a/doc/Makefile.am b/doc/Makefile.am
index db507f1..10fb3ec 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,20 +1,5 @@
-if BOOTSTRAP
-BOOTSTRAP_SCITECO = $(topsrcdir)/src/sciteco-minimal$(EXEEXT)
-else
-BOOTSTRAP_SCITECO = @SCITECO@
-endif
-REPL_MACRO = eb$<\e \
-	     <fs@PACKAGE^Q@\e@PACKAGE@\e;>j \
-	     <fs@PACKAGE_NAME^Q@\e@PACKAGE_NAME@\e;>j \
-	     <fs@PACKAGE_VERSION^Q@\e@PACKAGE_VERSION@\e;>j \
-	     <fs@PACKAGE_URL^Q@\e@PACKAGE_URL@\e;>j \
-	     <fs@pkgdatadir^Q@\e$(pkgdatadir)\e;>j \
-	     <fs@DATE^Q@\e$(shell @DATE@ "+%d %b %Y")\e;>j \
-	     ew$@\e
+include $(top_srcdir)/bootstrap.am
 
 man_MANS = sciteco.1
 EXTRA_DIST = sciteco.1.in
 CLEANFILES = sciteco.1
-
-% : %.in
-	$(BOOTSTRAP_SCITECO) -e $$'$(REPL_MACRO)'
diff --git a/src/Makefile.am b/src/Makefile.am
index 8761df9..e714780 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/bootstrap.am
+
 AM_CFLAGS = -Wall -std=c99
 AM_CXXFLAGS = -Wall
 AM_CPPFLAGS =
@@ -12,10 +14,7 @@ EXTRA_DIST = gtk-info-popup.gob \
 
 if BOOTSTRAP
 noinst_PROGRAMS = sciteco-minimal
-BOOTSTRAP_SCITECO = ./sciteco-minimal$(EXEEXT)
 symbols-scintilla.cpp symbols-scilexer.cpp : $(BOOTSTRAP_SCITECO)
-else
-BOOTSTRAP_SCITECO = @SCITECO@
 endif
 sciteco_minimal_SOURCES = main.cpp sciteco.h \
 			  cmdline.cpp cmdline.h \
-- 
cgit v1.2.3