From 07ffe7d583ba708c3c058f455a02099175ec0b9f Mon Sep 17 00:00:00 2001 From: William Moore Date: Sun, 10 Mar 2024 16:22:42 -0500 Subject: [PATCH] Update to use new Makefile approach --- Makefile | 22 +++++++++++++++------- Targets | 1 + src/culinaria/culinaria.adobe | 0 src/culinaria/culinaria.html | 0 src/{ => culinaria}/culinaria.tex | 9 +++++---- src/{ => culinaria}/images/back.png | Bin src/{ => culinaria}/images/front.png | Bin src/{ => culinaria}/images/section1.png | Bin src/{ => culinaria}/images/section2.png | Bin src/{ => culinaria}/images/section3.png | Bin 10 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 Targets create mode 100644 src/culinaria/culinaria.adobe create mode 100644 src/culinaria/culinaria.html rename src/{ => culinaria}/culinaria.tex (99%) rename src/{ => culinaria}/images/back.png (100%) rename src/{ => culinaria}/images/front.png (100%) rename src/{ => culinaria}/images/section1.png (100%) rename src/{ => culinaria}/images/section2.png (100%) rename src/{ => culinaria}/images/section3.png (100%) diff --git a/Makefile b/Makefile index c61bb92..eb76414 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,17 @@ -BUILDDIR=./build -SRCDIR=./src +include Targets + +all: $(TARGETS) + +$(TARGETS): + - mkdir -p build/$@ + - mkdir -p build/www/$@ + - cp src/$@/*.jpg build/$@/ + - cp src/$@/*.png build/$@/ + + - test -f ./src/$@/$@.md && pandoc -s ./src/$@/$@.tex -o ./build/$@.md --standalone --mathjax && cat ./build/$@.md | sed -e 's/\(::: center\)//g' | sed -e 's/::://g' > ./build/$@.md.tmp && mv ./build/$@.md.tmp ./build/$@.md + - test -f ./src/$@/$@.html && pandoc -s ./src/$@/$@.tex -o ./build/$@.html --standalone + - test -f ./src/$@/$@.cfg && test -f ./src/$@/$@.tex && tex4ebook -c ./src/$@/$@.cfg -d build/ ./src/$@/$@.tex && rm -rf $@-epub && rm $@*.* + - test -f ./src/$@/$@.adobe && test -f ./src/$@/$@.tex && latex --output-format=pdf --output-directory=build/ --directory=build/ ./src/$@/$@.tex && latex --output-format=pdf --output-directory=build/ --directory=build/ ./src/$@/$@.tex -all: - - mkdir build - latex --output-format=pdf --output-directory=$(BUILDDIR) $(SRCDIR)/culinaria.tex - latex --output-format=pdf --output-directory=$(BUILDDIR) $(SRCDIR)/culinaria.tex clean: - - rm -rf $(BUILDDIR) + - rm -rf build diff --git a/Targets b/Targets new file mode 100644 index 0000000..26e2d03 --- /dev/null +++ b/Targets @@ -0,0 +1 @@ +TARGETS=culinaria diff --git a/src/culinaria/culinaria.adobe b/src/culinaria/culinaria.adobe new file mode 100644 index 0000000..e69de29 diff --git a/src/culinaria/culinaria.html b/src/culinaria/culinaria.html new file mode 100644 index 0000000..e69de29 diff --git a/src/culinaria.tex b/src/culinaria/culinaria.tex similarity index 99% rename from src/culinaria.tex rename to src/culinaria/culinaria.tex index 4c3bd0f..5aac57d 100644 --- a/src/culinaria.tex +++ b/src/culinaria/culinaria.tex @@ -1,9 +1,10 @@ % This work is licensed under the Creative Commons BY-NC-SA 4.0 License. To view a copy of the license, visit https://rezrov.xyz/caranmegil/culinaria/src/branch/main/LICENSE. \documentclass[titlepage]{article} +\usepackage[a4paper]{geometry} \usepackage{graphicx} \usepackage[dvipsnames]{xcolor} -\graphicspath{ {./src/images/} } +\graphicspath{ {./src/culinaria/images/} } \title{The "William Moore" Culinaria} @@ -192,7 +193,7 @@ To prepare, combine all ingredients but the dried and ground chillies. Refrigera \section*{My Internet Friends} \addcontentsline{toc}{section}{My Internet Friends} \textit{These recipes were contributed by several people I know from the Internet games, social media, etc. I've tried to keep the names of the people either by their real names or handles.} - \newpage + \newpage \subsection*{Ikes' "Internet Famous" Chicken Fajitas} \addcontentsline{toc}{subsection}{Ikes' "Internet Famous" Chicken Fajitas} \textbf{by Ikes} @@ -241,7 +242,7 @@ To prepare, combine all ingredients but the dried and ground chillies. Refrigera In a small bowl, whisk together: coriander, cumin, turmeric, crushed fennel seeds, cinnamon, pepper, mustard, cloves. Heat oil in a skillet over medium-high heat. Add onion and saute until golden brown (about 4-6 minutes). Add garlic, blend, and saute for another 30 seconds. Add in whisked spice blend and saute for 30 seconds more. Pour in chicken broth and tomatoes and bring to a boil. Reduce heat once boiling and simmer for 5 minutes. Pour the mixture in a blender and puree. Pour mixture back into a skillet. Add salt and cayenne pepper. Add the cubed chicken. Simmer and cover the skillet with a lid until chicken is cooked thoroughly with occasional stirring (about 8-12 minutes). Mix cornstarch and water and add to the skillet. Once chicken is fully cooked, add the cream and cilantro. \subsubsection*{William's Notes} You can certainly replace the whipping cream with say 16 oz of unsweetened coconut milk. - \newpage + \newpage \subsection*{Jonn's Mushroom Soup} \addcontentsline{toc}{subsection}{Jonn's Mushroom Soup} \textbf{by Jonn} @@ -291,4 +292,4 @@ To prepare, combine all ingredients but the dried and ground chillies. Refrigera \vspace*{\fill} \noindent\fbox{\makebox[\textwidth]{\includegraphics[width=\textwidth]{back}}} \vspace*{\fill} -\end{document} \ No newline at end of file +\end{document} diff --git a/src/images/back.png b/src/culinaria/images/back.png similarity index 100% rename from src/images/back.png rename to src/culinaria/images/back.png diff --git a/src/images/front.png b/src/culinaria/images/front.png similarity index 100% rename from src/images/front.png rename to src/culinaria/images/front.png diff --git a/src/images/section1.png b/src/culinaria/images/section1.png similarity index 100% rename from src/images/section1.png rename to src/culinaria/images/section1.png diff --git a/src/images/section2.png b/src/culinaria/images/section2.png similarity index 100% rename from src/images/section2.png rename to src/culinaria/images/section2.png diff --git a/src/images/section3.png b/src/culinaria/images/section3.png similarity index 100% rename from src/images/section3.png rename to src/culinaria/images/section3.png