Changeset 5828554 in mainline for uspace/Makefile

Timestamp:

2014-01-19T14:37:22Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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 mainline changes

File:

• uspace/Makefile (modified) (5 diffs)

uspace/Makefile

@@ -45 +45 @@
         app/edit \
         app/getterm \
+        app/hdisk \
         app/init \
         app/inet \
         app/kill \
         app/killall \
-        app/klog \
+        app/kio \
         app/loc \
         app/logset \
@@ -68 +69 @@
         app/trace \
         app/top \
+        app/untar \
         app/usbinfo \
         app/vuhid \
@@ -90 +92 @@
         srv/locsrv \
         srv/logger \
+        srv/klog \
         srv/devman \
         srv/loader \
@@ -239 +242 @@
         lib/softrend \
         lib/draw \
+        lib/math \
         lib/net \
         lib/nic \
@@ -250 +254 @@
         lib/pcm \
         lib/bithenge \
-        lib/posix
+        lib/posix \
+        lib/mbr \
+        lib/gpt
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))