From 5ed633942d32ea5302107591ac3b1beb5adb502e Mon Sep 17 00:00:00 2001
From: CleverMouse <theclevermouse@yandex.ru>
Date: Mon, 6 Feb 2012 10:58:01 +0000
Subject: [PATCH] autobuild: fix dependency tracking for fasm in case of spaces
 in name

git-svn-id: svn://kolibrios.org@2347 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 data/Vortex86MX-eng/Makefile.fasm | 8 ++++----
 data/eng/Makefile.fasm            | 6 +++---
 data/rus/Makefile.fasm            | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/Vortex86MX-eng/Makefile.fasm b/data/Vortex86MX-eng/Makefile.fasm
index 9fab3ed7b1..9a8b561939 100644
--- a/data/Vortex86MX-eng/Makefile.fasm
+++ b/data/Vortex86MX-eng/Makefile.fasm
@@ -31,22 +31,22 @@ $(1): $(2) Makefile.fasm .deps/.dir $$(call respace,$$(addsuffix .dir,$(3)))
 	fasm -m 65536 $$< "$$@" -s .deps/$(4).fas
 	prepsrc .deps/$(4).fas /dev/null
 	prepsrc .deps/$(4).fas /dev/stdout | \
-	perl -n -e 's|\\|/|g;push @a,$$$$1 if/^;include \x27(.*?)\x27/;' \
-	-e 'END{$$$$a=join " \\\n ",@a;print "$(1): $$$$a\n$$$$a:\n"}' > .deps/$(4).Po
+	perl -n -e 's|\\|/|g;push @a,"\"$$$$1\"" if/^;include \x27(.*?)\x27/;' \
+	-e 'END{$$$$a=join " \\\n ",@a;print q`$(1): `,"$$$$a\n$$$$a:\n"}' > .deps/$(4).Po
 	kpack --nologo "$$@"
 -include .deps/$(4).Po
 endef
 
 progname=$(call respace,$(basename $(notdir $(call binarypart,$(f)))))
 binarydir=$(subst ./,,$(dir $(call binarypart,$(f))))
-$(foreach f,$(FASM_PROGRAMS),$(eval $(call fasm_meta_rule,$(fbinary),$(fsource),$(binarydir),$(progname))))
+$(foreach f,$(FASM_PROGRAMS) $(FASM_PROGRAMS_CD),$(eval $(call fasm_meta_rule,$(fbinary),$(fsource),$(binarydir),$(progname))))
 
 # Rule for the kernel differs: it uses kerpack instead of kpack.
 kernel.mnt: $(KERNEL)/kernel.asm Makefile.fasm .deps/.dir
 	fasm -m 65536 $< "$@" -s .deps/kernel.fas
 	prepsrc .deps/kernel.fas /dev/null
 	prepsrc .deps/kernel.fas /dev/stdout | \
-	perl -n -e 's|\\|/|g;push @a,$$1 if/^;include \x27(.*?)\x27/;' \
+	perl -n -e 's|\\|/|g;push @a,"\"$$1\"" if/^;include \x27(.*?)\x27/;' \
 	-e 'END{$$a=join " \\\n ",@a;print "$@: $$a\n$$a:\n"}' > .deps/kernel.Po
 	kerpack $@
 -include .deps/kernel.Po
diff --git a/data/eng/Makefile.fasm b/data/eng/Makefile.fasm
index 343d74f048..9a8b561939 100644
--- a/data/eng/Makefile.fasm
+++ b/data/eng/Makefile.fasm
@@ -31,8 +31,8 @@ $(1): $(2) Makefile.fasm .deps/.dir $$(call respace,$$(addsuffix .dir,$(3)))
 	fasm -m 65536 $$< "$$@" -s .deps/$(4).fas
 	prepsrc .deps/$(4).fas /dev/null
 	prepsrc .deps/$(4).fas /dev/stdout | \
-	perl -n -e 's|\\|/|g;push @a,$$$$1 if/^;include \x27(.*?)\x27/;' \
-	-e 'END{$$$$a=join " \\\n ",@a;print "$(1): $$$$a\n$$$$a:\n"}' > .deps/$(4).Po
+	perl -n -e 's|\\|/|g;push @a,"\"$$$$1\"" if/^;include \x27(.*?)\x27/;' \
+	-e 'END{$$$$a=join " \\\n ",@a;print q`$(1): `,"$$$$a\n$$$$a:\n"}' > .deps/$(4).Po
 	kpack --nologo "$$@"
 -include .deps/$(4).Po
 endef
@@ -46,7 +46,7 @@ kernel.mnt: $(KERNEL)/kernel.asm Makefile.fasm .deps/.dir
 	fasm -m 65536 $< "$@" -s .deps/kernel.fas
 	prepsrc .deps/kernel.fas /dev/null
 	prepsrc .deps/kernel.fas /dev/stdout | \
-	perl -n -e 's|\\|/|g;push @a,$$1 if/^;include \x27(.*?)\x27/;' \
+	perl -n -e 's|\\|/|g;push @a,"\"$$1\"" if/^;include \x27(.*?)\x27/;' \
 	-e 'END{$$a=join " \\\n ",@a;print "$@: $$a\n$$a:\n"}' > .deps/kernel.Po
 	kerpack $@
 -include .deps/kernel.Po
diff --git a/data/rus/Makefile.fasm b/data/rus/Makefile.fasm
index 343d74f048..9a8b561939 100644
--- a/data/rus/Makefile.fasm
+++ b/data/rus/Makefile.fasm
@@ -31,8 +31,8 @@ $(1): $(2) Makefile.fasm .deps/.dir $$(call respace,$$(addsuffix .dir,$(3)))
 	fasm -m 65536 $$< "$$@" -s .deps/$(4).fas
 	prepsrc .deps/$(4).fas /dev/null
 	prepsrc .deps/$(4).fas /dev/stdout | \
-	perl -n -e 's|\\|/|g;push @a,$$$$1 if/^;include \x27(.*?)\x27/;' \
-	-e 'END{$$$$a=join " \\\n ",@a;print "$(1): $$$$a\n$$$$a:\n"}' > .deps/$(4).Po
+	perl -n -e 's|\\|/|g;push @a,"\"$$$$1\"" if/^;include \x27(.*?)\x27/;' \
+	-e 'END{$$$$a=join " \\\n ",@a;print q`$(1): `,"$$$$a\n$$$$a:\n"}' > .deps/$(4).Po
 	kpack --nologo "$$@"
 -include .deps/$(4).Po
 endef
@@ -46,7 +46,7 @@ kernel.mnt: $(KERNEL)/kernel.asm Makefile.fasm .deps/.dir
 	fasm -m 65536 $< "$@" -s .deps/kernel.fas
 	prepsrc .deps/kernel.fas /dev/null
 	prepsrc .deps/kernel.fas /dev/stdout | \
-	perl -n -e 's|\\|/|g;push @a,$$1 if/^;include \x27(.*?)\x27/;' \
+	perl -n -e 's|\\|/|g;push @a,"\"$$1\"" if/^;include \x27(.*?)\x27/;' \
 	-e 'END{$$a=join " \\\n ",@a;print "$@: $$a\n$$a:\n"}' > .deps/kernel.Po
 	kerpack $@
 -include .deps/kernel.Po