| 9,9 → 9,6 |
|---|
| KERNEL:=$(REPOSITORY)/kernel/trunk |
| PROGS:=$(REPOSITORY)/programs |
| |
| # The main goal: build kolibri.img and kolibri.iso |
| all: $(BUILD_DIR)/kolibri.img $(BUILD_DIR)/kolibri.iso |
| |
| # Docpak requires some documents; we place them |
| # into 'docs' subdir and communicate with FASM |
| # through environment var DOCDIR. |
| 279,11 → 276,6 |
|---|
| #end of list |
| #3d/logio.bmp:3D/LOGIO.BMP 3d/cubetext:3D/CUBETEXT |
| |
| # Generate skins list understandable by gnu make |
| Makefile.skins: $(REPOSITORY)/skins/authors.txt $(REPOSITORY)/data/generate_makefile_skins.sh |
| cut -f1 $< | $(SHELL) $(REPOSITORY)/data/generate_makefile_skins.sh > $@ |
| include Makefile.skins |
| |
| # Extra targets for LiveCD image in the syntax of mkisofs |
| MKISOFS_EXTRA:=\ |
| dosbox/=$(PROGS)/emulator/DosBox/dosbox \ |
| 291,10 → 283,6 |
|---|
| dosbox/=$(PROGS)/emulator/DosBox/readme.txt \ |
| /=drivers/atikms \ |
| /=drivers/atikms.dll \ |
| /=distr_data/autorun.inf \ |
| /=distr_data/KolibriOS_icon.ico \ |
| /=distr_data/readme.txt \ |
| Skins/=$(REPOSITORY)/skins/authors.txt \ |
| #end of list |
| |
| # Some macro for convenient work. |
| 339,12 → 327,13 |
|---|
| endef |
| mcopy_all_items:=$(foreach f,$(targets_full),$(mcopy_item_command)$(newline)) |
| |
| # add skins to MKISOFS_EXTRA |
| MKISOFS_EXTRA:=$(MKISOFS_EXTRA) $(foreach f,$(SKIN_SOURCES),$(call imagepart,$(f))=$(call binarypart,$(f))) |
| # dependencies of MKISOFS_EXTRA; we iterate through $(MKISOFS_EXTRA), |
| # substitute "=" with space, get the 2nd word and join all results |
| mkisofs_extra_targets:=$(call respace,$(foreach f,$(MKISOFS_EXTRA),$(word 2,$(subst =, ,$(f))))) |
| mkisofs_extra_targets:=$(foreach f,$(MKISOFS_EXTRA),$(word 2,$(subst =, ,$(f)))) |
| |
| # The main goal: build kolibri.img and kolibri.iso |
| all: $(BUILD_DIR)/kolibri.img $(BUILD_DIR)/kolibri.iso |
| |
| # The first goal: floppy image. |
| $(BUILD_DIR)/kolibri.img: $(BUILD_DIR)/.dir \ |
| Makefile \ |
| 375,7 → 364,7 |
|---|
| $(BUILD_DIR)/kolibri.iso: $(BUILD_DIR)/kolibri.img $(mkisofs_extra_targets) |
| mkisofs -U -J -pad -b kolibri.img -c boot.catalog -hide-joliet boot.catalog -hide-joliet kolibri.img -graft-points \ |
| -A "KolibriOS AutoBuilder" -p "CleverMouse" -publisher "KolibriOS Team" -V "KolibriOS r$(REV)" -sysid "KOLIBRI" \ |
| -iso-level 3 -o $(BUILD_DIR)/kolibri.iso $(BUILD_DIR)/kolibri.img $(call respace,$(MKISOFS_EXTRA)) 2>&1 |
| -iso-level 3 -o $(BUILD_DIR)/kolibri.iso $(BUILD_DIR)/kolibri.img $(MKISOFS_EXTRA) 2>&1 |
| |
| # Special targets to modify behaviour of make. |
| .DELETE_ON_ERROR: |
| 386,7 → 375,7 |
|---|
| fasm $(KERNEL)/bootloader/boot_fat12.asm $(BUILD_DIR)/boot_fat12.bin |
| |
| $(BUILD_DIR)/.dir 3d/.dir demos/.dir develop/.dir develop/info/.dir drivers/.dir fonts/.dir \ |
| games/.dir lib/.dir media/.dir network/.dir allskins/.dir .deps/.dir: |
| games/.dir lib/.dir media/.dir network/.dir .deps/.dir: |
| mkdir -p $(dir $@) |
| touch $@ |
| develop/info/.dir: develop/.dir |