Changeset 97c7682 in mainline for uspace/Makefile

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/Makefile (modified) (5 diffs)

uspace/Makefile

@@ -42 +42 @@
         app/getterm \
         app/init \
+        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 \
@@ -67 +69 @@
         app/nettest3 \
         app/ping \
-        app/websrv \
         app/sysinfo \
         app/mkbd \
-        srv/clip \
-        srv/loc \
+        app/websrv \
+        srv/clipboard \
+        srv/locsrv \
         srv/devman \
         srv/loader \
+        srv/net/ethip \
+        srv/net/inetsrv \
+        srv/net/loopip \
+        srv/net/tcp \
+        srv/net/udp \
         srv/ns \
         srv/taskmon \
@@ -96 +103 @@
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
-        srv/net/il/arp \
-        srv/net/il/ip \
-        srv/net/tl/icmp \
-        srv/net/tl/udp \
-        srv/net/tl/tcp \
-        srv/net/nil/eth \
-        srv/net/nil/nildummy \
-        srv/net/net \
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
@@ -122 +121 @@
         drv/bus/usb/usbmid \
         drv/bus/usb/vhc \
-        drv/nic/lo \
         drv/nic/ne2k \
         drv/nic/e1k \
@@ -138 +136 @@
 DIRS += \
         app/binutils
+endif
+
+ifeq ($(CONFIG_MSIM),y)
+DIRS += \
+        app/msim
 endif