Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 61ab4a9 in mainline


Ignore:
Timestamp:
2013-09-02T20:03:17Z (7 years ago)
Author:
Dominik Taborsky (AT DOT) <brembyseznamcz>
Branches:
master
Children:
802898f
Parents:
1b34360 (diff), 0435fe41 (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:

libmbr, libgpt, hdisk merge

Files:
23 added
4 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile.common

    r1b34360 r61ab4a9  
    172172        $(USPACE_PATH)/app/dnsres/dnsres \
    173173        $(USPACE_PATH)/app/edit/edit \
     174        $(USPACE_PATH)/app/hdisk/hdisk \
    174175        $(USPACE_PATH)/app/inet/inet \
    175176        $(USPACE_PATH)/app/kill/kill \
  • uspace/Makefile

    r1b34360 r61ab4a9  
    4343        app/edit \
    4444        app/getterm \
     45        app/hdisk \
    4546        app/init \
    4647        app/inet \
     
    234235        lib/pcm \
    235236        lib/bithenge \
    236         lib/posix
     237        lib/posix \
     238        lib/mbr \
     239        lib/gpt
    237240
    238241LIBC_BUILD = $(addsuffix .build,$(LIBC))
  • uspace/Makefile.common

    r1b34360 r61ab4a9  
    141141LIBBITHENGE_PREFIX = $(LIB_PREFIX)/bithenge
    142142
     143LIBMBR_PREFIX = $(LIB_PREFIX)/mbr
     144LIBGPT_PREFIX = $(LIB_PREFIX)/gpt
     145
    143146ifeq ($(STATIC_NEEDED),y)
    144147        STATIC_BUILD = y
  • uspace/lib/c/Makefile

    r1b34360 r61ab4a9  
    6464        generic/cap.c \
    6565        generic/cfg.c \
     66        generic/checksum.c \
    6667        generic/clipboard.c \
    6768        generic/devman.c \
Note: See TracChangeset for help on using the changeset viewer.