single makefile

Makefile

@@ -27,11 +27,26 @@ $(image_name)-$(version):
 install-deps:
 	dnf install -y lorax xorriso podman git rpm-ostree
 
+
+
+lorax_templates/%.tmpl: lorax_templates/%.tmpl.in
+	sed 's/@IMAGE_NAME@/$(image_name)' $*.in > $*
+	sed 's/@IMAGE_REPO@/$(image_repo)' $* > $*
+	sed 's/@VERSION@/$(version)' $* $*
+
+
+
+xorriso/input.txt: xorriso/gen_input.sh
+	bash xorriso/gen_input.sh > input.txt
+
+xorriso/%.sh: xorriso/%.sh.in
+	sed 's/@IMAGE_NAME@/$(image_name)-$(version)/' $*.in > $*
+
+
 clean:
 	rm -f boot.iso
 	rm -f deploy.iso
 	rm -Rf $(image_name)-$(version)
-	for dir in $(subdir) ; do \
+	rm lorax_templates/*.tmpl
-    	$(MAKE) -C $$dir clean ; \
+	rm xorriso/input.txt
-	done
+	rm xorriso/gen_input.sh
-

lorax_templates/Makefile

@@ -1,7 +0,0 @@
-%.tmpl:
-	sed 's/@IMAGE_NAME@/$(image_name)' $*.in > $*
-	sed 's/@IMAGE_REPO@/$(image_repo)' $* > $*
-	sed 's/@VERSION@/$(version)' $* $*
-
-clean:
-	rm *.tmpl

xorriso/Makefile

@@ -1,9 +0,0 @@
-input.txt: gen_input.sh
-	bash gen_input.sh "$(base_dir)" > input.txt
-
-%.sh:
-	sed 's/@IMAGE_NAME@/$(image_name)-$(version)/' $*.in > $*
-
-clean:
-  rm input.txt
-  rm gen_input.sh

xorriso/gen_input.sh.in

@@ -6,7 +6,6 @@ echo "-boot_image any replay"
 echo "-volid Fedora-S-dvd-x86_64-39"
 echo "-joliet on"
 echo "-compliance joliet_long_names"
-cd $1
 for file in $(find @IMAGE_NAME@)
 do
     echo "-map $(pwd)/${file} ${file}"