sdongles/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

autobuild: fix dependency tracking for fasm in case of spaces in name

Browse Source 
git-svn-id: svn://kolibrios.org@2347 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
CleverMouse 2012-02-06 10:58:01 +00:00
parent 4e7ad16bb6
commit 5ed633942d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/Vortex86MX-eng/Makefile.fasm
View File

@ -31,22 +31,22 @@ $(1): $(2) Makefile.fasm .deps/.dir $$(call respace,$$(addsuffix .dir,$(3)))
fasm -m 65536 $$< "$$@" -s .deps/$(4).fas fasm -m 65536 $$< "$$@" -s .deps/$(4).fas
prepsrc .deps/$(4).fas /dev/null prepsrc .deps/$(4).fas /dev/null
prepsrc .deps/$(4).fas /dev/stdout | \ prepsrc .deps/$(4).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 "$(1): $$$$a\n$$$$a:\n"}' > .deps/$(4).Po -e 'END{$$$$a=join " \\\n ",@a;print q`$(1): `,"$$$$a\n$$$$a:\n"}' > .deps/$(4).Po
kpack --nologo "$$@" kpack --nologo "$$@"
-include .deps/$(4).Po -include .deps/$(4).Po
endef endef
progname=$(call respace,$(basename $(notdir $(call binarypart,$(f))))) progname=$(call respace,$(basename $(notdir $(call binarypart,$(f)))))
binarydir=$(subst ./,,$(dir $(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. # Rule for the kernel differs: it uses kerpack instead of kpack.
kernel.mnt: $(KERNEL)/kernel.asm Makefile.fasm .deps/.dir kernel.mnt: $(KERNEL)/kernel.asm Makefile.fasm .deps/.dir
fasm -m 65536 $< "$@" -s .deps/kernel.fas fasm -m 65536 $< "$@" -s .deps/kernel.fas
prepsrc .deps/kernel.fas /dev/null prepsrc .deps/kernel.fas /dev/null
prepsrc .deps/kernel.fas /dev/stdout | \ 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 -e 'END{$$a=join " \\\n ",@a;print "$@: $$a\n$$a:\n"}' > .deps/kernel.Po
kerpack $@ kerpack $@
-include .deps/kernel.Po -include .deps/kernel.Po

6
data/eng/Makefile.fasm
View File

@ -31,8 +31,8 @@ $(1): $(2) Makefile.fasm .deps/.dir $$(call respace,$$(addsuffix .dir,$(3)))
fasm -m 65536 $$< "$$@" -s .deps/$(4).fas fasm -m 65536 $$< "$$@" -s .deps/$(4).fas
prepsrc .deps/$(4).fas /dev/null prepsrc .deps/$(4).fas /dev/null
prepsrc .deps/$(4).fas /dev/stdout | \ prepsrc .deps/$(4).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 "$(1): $$$$a\n$$$$a:\n"}' > .deps/$(4).Po -e 'END{$$$$a=join " \\\n ",@a;print q`$(1): `,"$$$$a\n$$$$a:\n"}' > .deps/$(4).Po
kpack --nologo "$$@" kpack --nologo "$$@"
-include .deps/$(4).Po -include .deps/$(4).Po
endef endef
@ -46,7 +46,7 @@ kernel.mnt: $(KERNEL)/kernel.asm Makefile.fasm .deps/.dir
fasm -m 65536 $< "$@" -s .deps/kernel.fas fasm -m 65536 $< "$@" -s .deps/kernel.fas
prepsrc .deps/kernel.fas /dev/null prepsrc .deps/kernel.fas /dev/null
prepsrc .deps/kernel.fas /dev/stdout | \ 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 -e 'END{$$a=join " \\\n ",@a;print "$@: $$a\n$$a:\n"}' > .deps/kernel.Po
kerpack $@ kerpack $@
-include .deps/kernel.Po -include .deps/kernel.Po

6
data/rus/Makefile.fasm
View File

@ -31,8 +31,8 @@ $(1): $(2) Makefile.fasm .deps/.dir $$(call respace,$$(addsuffix .dir,$(3)))
fasm -m 65536 $$< "$$@" -s .deps/$(4).fas fasm -m 65536 $$< "$$@" -s .deps/$(4).fas
prepsrc .deps/$(4).fas /dev/null prepsrc .deps/$(4).fas /dev/null
prepsrc .deps/$(4).fas /dev/stdout | \ prepsrc .deps/$(4).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 "$(1): $$$$a\n$$$$a:\n"}' > .deps/$(4).Po -e 'END{$$$$a=join " \\\n ",@a;print q`$(1): `,"$$$$a\n$$$$a:\n"}' > .deps/$(4).Po
kpack --nologo "$$@" kpack --nologo "$$@"
-include .deps/$(4).Po -include .deps/$(4).Po
endef endef
@ -46,7 +46,7 @@ kernel.mnt: $(KERNEL)/kernel.asm Makefile.fasm .deps/.dir
fasm -m 65536 $< "$@" -s .deps/kernel.fas fasm -m 65536 $< "$@" -s .deps/kernel.fas
prepsrc .deps/kernel.fas /dev/null prepsrc .deps/kernel.fas /dev/null
prepsrc .deps/kernel.fas /dev/stdout | \ 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 -e 'END{$$a=join " \\\n ",@a;print "$@: $$a\n$$a:\n"}' > .deps/kernel.Po
kerpack $@ kerpack $@
-include .deps/kernel.Po -include .deps/kernel.Po