Changeset e6a78b9 in mainline for uspace/Makefile

Timestamp:

2012-06-29T15:31:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c (diff), 0bbd13e (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) (3 diffs)

uspace/Makefile

@@ -42 +42 @@
         app/getterm \
         app/init \
-        app/inetcfg \
+        app/inet \
         app/kill \
         app/killall \
         app/klog \
-        app/locinfo \
+        app/loc \
         app/lsusb \
         app/mkfat \
         app/mkexfat \
         app/mkmfs \
+        app/nterm \
         app/redir \
         app/sbi \
@@ -68 +69 @@
         app/nettest3 \
         app/ping \
-        app/websrv \
         app/sysinfo \
         app/mkbd \
+        app/websrv \
         srv/clipboard \
-        srv/loc \
+        srv/locsrv \
         srv/devman \
         srv/loader \
         srv/net/ethip \
-        srv/net/inet \
+        srv/net/inetsrv \
         srv/net/loopip \
         srv/net/tcp \
@@ -137 +138 @@
 endif
 
+ifeq ($(CONFIG_MSIM),y)
+DIRS += \
+        app/msim
+endif
+
 ## Platform-specific hardware support
 #