Subversion Repositories Kolibri OS

Compare Revisions

Ignore whitespace Rev 4751 → Rev 4752

/data/it/Makefile
466,7 → 466,6
Makefile \
$(BUILD_DIR)/boot_fat12.bin \
$(targets)
echo $(LD) $(CC) $(NASM)
str=`date -u +"[auto-build %d %b %Y %R, r$(REV)]"`; \
echo -n $$str|dd of=kernel.mnt bs=1 seek=`expr 279 - length "$$str"` conv=notrunc 2>/dev/null
dd if=/dev/zero of=$(BUILD_DIR)/kolibri.img count=2880 bs=512 2>&1
485,7 → 484,7
mmd -i $(BUILD_DIR)/kolibri.img ::MEDIA/ImgF
mmd -i $(BUILD_DIR)/kolibri.img ::NETWORK
mmd -i $(BUILD_DIR)/kolibri.img ::SETTINGS
$(mcopy_all_items)
@echo $(CC) $(LD) $(CFLAGS) $(LDFLAGS) && $(mcopy_all_items)
 
# The second goal: LiveCD image.
$(BUILD_DIR)/kolibri.iso: $(BUILD_DIR)/kolibri.img $(mkisofs_extra_targets)
713,5 → 712,5
 
#Rules for updf
UPDFDIR=$(REPOSITORY)/contrib/media/updf
updf:
updf:
$(MAKE) -C $(REPOSITORY)/programs/develop/libraries/menuetlibc