Changeset 8013637 in mainline for uspace/Makefile

Timestamp:

2012-07-20T13:51:28Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8fccd42

Parents:

c5bff3c (diff), 7030bc9 (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:

More mainline changes.

File:

• uspace/Makefile (modified) (5 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 \
@@ -84 +85 @@
         srv/vfs \
         srv/bd/ata_bd \
+        srv/bd/sata_bd \
         srv/bd/file_bd \
         srv/bd/gxe_bd \
@@ -104 +106 @@
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
+        drv/block/ahci \
         drv/char/i8042 \
         drv/char/ps2mouse \
@@ -135 +138 @@
 DIRS += \
         app/binutils
+endif
+
+ifeq ($(CONFIG_MSIM),y)
+DIRS += \
+        app/msim
 endif