Changeset b8b1e631 in mainline for boot/Makefile


Ignore:
Timestamp:
2011-12-03T11:10:06Z (12 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
30413b31
Parents:
07fd4cd1 (diff), 1f5c9c96 (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.
Message:

Merge with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile

    r07fd4cd1 rb8b1e631  
    4040        $(PACK) $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) arch/$(KARCH) $(COMPONENTS)
    4141
    42 $(INITRD).img: $(INITRD).fs
    43         $(MKHORD) $(PAGE_SIZE) $< $@
    44 
    45 $(INITRD).fs: build_dist
     42$(INITRD).img: build_dist
    4643ifeq ($(RDFMT),tmpfs)
    4744        $(MKTMPFS) $(DIST_PATH) $@
    … …  
    9592
    9693clean_dist:
    97         rm -f $(INITRD).fs $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) $(LINK).comp *.co
     94        rm -f $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) $(LINK).comp *.co
    9895        rm -f $(USPACE_PATH)/dist/srv/*
    9996        rm -rf $(USPACE_PATH)/dist/drv/*
Note: See TracChangeset for help on using the changeset viewer.