trying to make build work

tirimid · Oct 11, 2024 · 41df2cc · 41df2cc
1 parent 8bd0445
commit 41df2cc
Show file tree

Hide file tree

Showing 14 changed files with 7 additions and 13 deletions.
diff --git a/html/404.html → 404.html b/html/404.html → 404.html
diff --git a/Makefile b/Makefile
@@ -1,19 +1,13 @@
-.PHONY: all clean
+.PHONY: all
 
-CMF_DIR := cmf
-HTML_DIR := html
-CMFC := cmfc
-STYLE_FILE := style.css
-
-CMF_FILES := $(shell find $(CMF_DIR) -type f -name "*.cmf")
-HTML_FILES := $(patsubst $(CMF_DIR)/%.cmf,$(HTML_DIR)/%.html,$(CMF_FILES))
+CMF_FILES := $(shell find cmf -type f -name "*.cmf")
+HTML_FILES := $(patsubst cmf/%.cmf,html/%.html,$(CMF_FILES))
 
 all: $(HTML_FILES)
+	cp -r html/* .
+	rm -rf html
 
-clean:
-	rm -rf $(HTML_DIR)
-
-$(HTML_DIR)/%.html: $(CMF_DIR)/%.cmf
+html/%.html: cmf/%.cmf
 	@ mkdir -p $@
 	@ rmdir $@
-	$(CMFC) -o $@ -s $(STYLE_FILE) $<
+	cmfc -o $@ -s style.css $<
diff --git a/html/index.html → index.html b/html/index.html → index.html
diff --git a/tirimid/bfc.md → markdown/tirimid/bfc.md b/tirimid/bfc.md → markdown/tirimid/bfc.md
diff --git a/tirimid/escl.md → markdown/tirimid/escl.md b/tirimid/escl.md → markdown/tirimid/escl.md
diff --git a/tirimid/firstrg.md → markdown/tirimid/firstrg.md b/tirimid/firstrg.md → markdown/tirimid/firstrg.md
diff --git a/tirimid/ipa-translate.md → markdown/tirimid/ipa-translate.md b/tirimid/ipa-translate.md → markdown/tirimid/ipa-translate.md
diff --git a/tirimid/medioed.md → markdown/tirimid/medioed.md b/tirimid/medioed.md → markdown/tirimid/medioed.md
diff --git a/tirimid/mincbuild.md → markdown/tirimid/mincbuild.md b/tirimid/mincbuild.md → markdown/tirimid/mincbuild.md
diff --git a/tirimid/quevish.md → markdown/tirimid/quevish.md b/tirimid/quevish.md → markdown/tirimid/quevish.md
diff --git a/tirimid/sleeptalkerritual.md → markdown/tirimid/sleeptalkerritual.md b/tirimid/sleeptalkerritual.md → markdown/tirimid/sleeptalkerritual.md
diff --git a/tirimid/unnamic.md → markdown/tirimid/unnamic.md b/tirimid/unnamic.md → markdown/tirimid/unnamic.md
diff --git a/tirimid/vvsml.md → markdown/tirimid/vvsml.md b/tirimid/vvsml.md → markdown/tirimid/vvsml.md
diff --git a/html/tirimid/firstrg.html → tirimid/firstrg.html b/html/tirimid/firstrg.html → tirimid/firstrg.html