Changeset a43dfcb in mainline

Timestamp:

2018-11-12T16:39:21Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7429ffd

Parents:

aaa3c457

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-22 21:19:28)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-12 16:39:21)

Message:

Makefile.grub should be postbuild

Location:

boot

Files:

• Makefile.grub (modified) (1 diff)
• arch/amd64/Makefile.inc (modified) (1 diff)

boot/Makefile.grub

@@ -47 +47 @@
 endif
 
-all: $(BOOT_OUTPUT)
+all: $(POST_OUTPUT)
 
-$(BOOT_OUTPUT): build_dist
+$(POST_OUTPUT): build_dist
 ifeq ($(GRUB_ARCH),pc)
         $(GENISOIMAGE) -J -r -input-charset utf-8 -V "HelenOS-CD" -eltorito-boot $(ELTORITO) -no-emul-boot -boot-load-size 64 -boot-info-table -o $@ $(DISTROOT)/

boot/arch/amd64/Makefile.inc

@@ -70 +70 @@
         $(USPACE_PATH)/app/wavplay/demo.wav
 
-BOOT_OUTPUT = $(ROOT_PATH)/image.iso
-BUILD = Makefile.grub
+POST_OUTPUT = $(ROOT_PATH)/image.iso
+BUILD = Makefile.empty
+POSTBUILD = Makefile.grub