From a32033d0908d24847757406da4cebd39a6b1a310 Mon Sep 17 00:00:00 2001 From: CleverMouse Date: Thu, 20 Jan 2011 10:23:26 +0000 Subject: [PATCH] fix in english makefile for nasm git-svn-id: svn://kolibrios.org@1757 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/data/eng/Makefile b/data/eng/Makefile index 3199660e18..c07427e5d2 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -255,9 +255,10 @@ fimage=$(call respace,$(call imagepart,$(f))) fsource=$(call respace,$(call sourcepart,$(f))) # Define targets for image file. -# Join lists $(FASM_PROGRAMS), $(COPY_FILES) and $(OTHER_FILES); -# for each item in the united list call fbinary. -targets:=$(foreach f,$(COPY_FILES) $(FASM_PROGRAMS) $(OTHER_FILES),$(fbinary)) +# Join all the lists above. +targets_full:=$(COPY_FILES) $(FASM_PROGRAMS) $(NASM_PROGRAMS) $(OTHER_FILES) +# For each item in the united list call fbinary. +targets:=$(foreach f,$(targets_full),$(fbinary)) # Define a command for copying a file inside the image. # mcopy_command is a macro with two parameters, @@ -277,7 +278,7 @@ define newline endef -mcopy_all_items:=$(foreach f,$(FASM_PROGRAMS) $(COPY_FILES) $(OTHER_FILES),$(mcopy_item_command)$(newline)) +mcopy_all_items:=$(foreach f,$(targets_full),$(mcopy_item_command)$(newline)) # The main goal: image. $(BUILD_DIR)/kolibri.img: $(BUILD_DIR)/.dir \