From d879181e9fdfdbb5f5adff7564bdcc3cb06eb653 Mon Sep 17 00:00:00 2001
From: "Karl O. Pinc" <kop@karlpinc.com>
Date: Sun, 1 Oct 2023 15:48:06 -0500
Subject: [PATCH] Move secondexpansion make code into it's own file

---
 Makefile                      |  2 +-
 make_files/make_docs.mk       | 45 --------------------------
 make_files/secondexpansion.mk | 59 +++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 46 deletions(-)
 create mode 100644 make_files/secondexpansion.mk

diff --git a/Makefile b/Makefile
index 42543b2..0b30d4d 100644
--- a/Makefile
+++ b/Makefile
@@ -76,4 +76,4 @@ include $(MAKE_FILES)/make_commands.mk
 #
 
 include $(MAKE_FILES)/make_docs.mk
-
+include $(MAKE_FILES)/secondexpansion.mk
diff --git a/make_files/make_docs.mk b/make_files/make_docs.mk
index d906c70..3f872e8 100644
--- a/make_files/make_docs.mk
+++ b/make_files/make_docs.mk
@@ -419,48 +419,3 @@ $(VIEW_SOURCE):
 	        TARGET_TYPE=views/create \
 	        TARGET_THING=$$(basename -s .sql $@) \
 	        sql_file
-
-#
-# Allow automatic variables to be used in prerequsites
-#
-.SECONDEXPANSION:
-
-# Construct *.svg files
-$(SVG_FILES): $$(patsubst %.svg,%.svg,\
-                          $$(subst $(IMAGES_BASEDIR),$(INKSCAPE_BASEDIR),$$@))\
-              $(DOC_DEPENDS) $(IMAGES_BASEDIR)
-	inkscape --export-filename=$@ --export-plain-svg $<
-
-# Construct *.png files
-$(PNG_FILES): $$(patsubst %.png,%.svg,\
-                          $$(subst $(IMAGES_BASEDIR),$(INKSCAPE_BASEDIR),$$@))\
-             $(DOC_DEPENDS) $(IMAGES_BASEDIR)
-	inkscape --export-filename=$@ $<
-
-# Build all the RST for html output
-$(HTML_RST_FILES): $$(patsubst %.rst,%.m4,\
-                        $$(subst $(HTML_SRCDIR),$(STOCK_SRCDIR),$$@)) \
-                   $(DOC_DEPENDS)
-	m4 $(M4_DOC_INCLUDE_ARGS) \
-           --define=sdb_output_fmt=$(SDB_HTML_FMT) \
-	   $< \
-	  > $@
-
-# Build all the RST for latex output
-$(LATEX_RST_FILES): $$(patsubst %.rst,%.m4,\
-                         $$(subst $(LATEX_SRCDIR),$(STOCK_SRCDIR),$$@)) \
-                    $(DOC_DEPENDS)
-	m4 $(M4_DOC_INCLUDE_ARGS) \
-           --define=sdb_output_fmt=latex \
-	   $(patsubst %.rst,%.m4,\
-	              $(subst $(LATEX_SRCDIR),$(STOCK_SRCDIR),$@)) \
-	  > $@
-
-# The "body" of the CREATE VIEW statements.
-$(VIEW_SQL): db/schemas/$$(notdir $$(patsubst \
-               %/,%,$$(dir $$@)))/views/create/$$(notdir $$@) \
-             $(VIEW_DIR) doc/extract_view.py
-	mkdir -p $(VIEW_DIR)/$$(basename $$(dirname $@))
-	doc/extract_view.py \
-	  < $< \
-	  > $@
diff --git a/make_files/secondexpansion.mk b/make_files/secondexpansion.mk
new file mode 100644
index 0000000..e0b5d1b
--- /dev/null
+++ b/make_files/secondexpansion.mk
@@ -0,0 +1,59 @@
+# Copyright (C) 2019, 2023 The Meme Factory, Inc.  www.karlpinc.com
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Allow automatic variables to be used in prerequsites
+#
+.SECONDEXPANSION:
+
+# Construct *.svg files
+$(SVG_FILES): $$(patsubst %.svg,%.svg,\
+                          $$(subst $(IMAGES_BASEDIR),$(INKSCAPE_BASEDIR),$$@))\
+              $(DOC_DEPENDS) $(IMAGES_BASEDIR)
+	inkscape --export-filename=$@ --export-plain-svg $<
+
+# Construct *.png files
+$(PNG_FILES): $$(patsubst %.png,%.svg,\
+                          $$(subst $(IMAGES_BASEDIR),$(INKSCAPE_BASEDIR),$$@))\
+             $(DOC_DEPENDS) $(IMAGES_BASEDIR)
+	inkscape --export-filename=$@ $<
+
+# Build all the RST for html output
+$(HTML_RST_FILES): $$(patsubst %.rst,%.m4,\
+                        $$(subst $(HTML_SRCDIR),$(STOCK_SRCDIR),$$@)) \
+                   $(DOC_DEPENDS)
+	m4 $(M4_DOC_INCLUDE_ARGS) \
+           --define=sdb_output_fmt=$(SDB_HTML_FMT) \
+	   $< \
+	  > $@
+
+# Build all the RST for latex output
+$(LATEX_RST_FILES): $$(patsubst %.rst,%.m4,\
+                         $$(subst $(LATEX_SRCDIR),$(STOCK_SRCDIR),$$@)) \
+                    $(DOC_DEPENDS)
+	m4 $(M4_DOC_INCLUDE_ARGS) \
+           --define=sdb_output_fmt=latex \
+	   $(patsubst %.rst,%.m4,\
+	              $(subst $(LATEX_SRCDIR),$(STOCK_SRCDIR),$@)) \
+	  > $@
+
+# The "body" of the CREATE VIEW statements.
+$(VIEW_SQL): db/schemas/$$(notdir $$(patsubst \
+               %/,%,$$(dir $$@)))/views/create/$$(notdir $$@) \
+             $(VIEW_DIR) doc/extract_view.py
+	mkdir -p $(VIEW_DIR)/$$(basename $$(dirname $@))
+	doc/extract_view.py \
+	  < $< \
+	  > $@
-- 
2.34.1