Changeset 4c14b88 in mainline for uspace/Makefile

Timestamp:

2013-12-31T07:57:14Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1b973dc

Parents:

6297465 (diff), 208b5f5 (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:

mainline changes

File:

• uspace/Makefile (modified) (6 diffs)

uspace/Makefile

@@ -45 +45 @@
         app/edit \
         app/getterm \
+        app/hdisk \
         app/init \
         app/inet \
@@ -68 +69 @@
         app/trace \
         app/top \
+        app/untar \
         app/usbinfo \
         app/vuhid \
@@ -76 +78 @@
         app/nettest3 \
         app/ping \
-        app/ping6 \
         app/sysinfo \
         app/mkbd \
         app/date \
         app/vdemo \
+        app/viewer \
         app/vlaunch \
         app/vterm \
@@ -97 +99 @@
         srv/net/inetsrv \
         srv/net/loopip \
+        srv/net/nconfsrv \
         srv/net/slip \
         srv/net/tcp \
@@ -237 +240 @@
         lib/softrend \
         lib/draw \
+        lib/math \
         lib/net \
         lib/nic \
@@ -248 +252 @@
         lib/pcm \
         lib/bithenge \
-        lib/posix
+        lib/posix \
+        lib/mbr \
+        lib/gpt
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))