Changeset 0b9ac3c in mainline for boot/arch/amd64/Makefile.inc
- Timestamp:
- 2010-02-23T19:03:28Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- c62d2e1
- Parents:
- 1ccafee (diff), 5e50394 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/arch/amd64/Makefile.inc
-
Property mode
changed from
100644
to100755
r1ccafee r0b9ac3c 33 33 $(USPACEDIR)/srv/hw/char/i8042/i8042 \ 34 34 $(USPACEDIR)/srv/hw/bus/pci/pci \ 35 $(USPACEDIR)/srv/hid/c _mouse/c_mouse35 $(USPACEDIR)/srv/hid/char_mouse/char_ms 36 36 37 37 MODULES := $(notdir $(COMPONENTS)) … … 39 39 build: $(BASE)/image.iso 40 40 41 $(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) 41 $(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) $(CFG) 42 42 mkdir -p $(TMP)/boot/grub 43 43 cp arch/$(BARCH)/grub/stage2_eltorito $(TMP)/boot/grub/ … … 56 56 done 57 57 58 rm -f $(USPACEDIR)/dist/srv/* 59 rm -f $(USPACEDIR)/dist/app/* 60 rm -f $(USPACEDIR)/dist/cfg/net/* 61 58 62 cp $(KERNELDIR)/kernel.bin $(TMP)/boot/ 59 63 for task in $(INIT_TASKS) ; do \ … … 65 69 for file in $(RD_APPS) ; do \ 66 70 cp $$file $(USPACEDIR)/dist/app/ ; \ 71 done 72 for file in $(NET_CFG) ; do \ 73 cp $$file $(USPACEDIR)/dist/cfg/net/ ; \ 67 74 done 68 75 … … 78 85 79 86 clean: 87 rm -f $(USPACEDIR)/dist/srv/* 88 rm -f $(USPACEDIR)/dist/app/* 89 rm -f $(USPACEDIR)/dist/cfg/net/* 90 80 91 for file in $(RD_SRVS) ; do \ 81 92 rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \ … … 84 95 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \ 85 96 done 97 for file in $(NET_CFG) ; do \ 98 rm -f $(USPACEDIR)/dist/cfg/net/`basename $$file` ; \ 99 done 86 100 rm -fr $(TMP) 87 101 rm -f $(BASE)/image.iso -
Property mode
changed from
Note:
See TracChangeset
for help on using the changeset viewer.