Changeset eb083ad in mainline for boot/Makefile.common

Timestamp:

2012-05-17T21:09:06Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

8fde078

Parents:

a8b8086 (diff), 3e67ab1 (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:

• boot/Makefile.common (modified) (4 diffs)

boot/Makefile.common

@@ -72 +72 @@
         $(USPACE_PATH)/srv/loader/loader \
         $(USPACE_PATH)/app/init/init \
-        $(USPACE_PATH)/srv/loc/loc \
+        $(USPACE_PATH)/srv/locsrv/locsrv \
         $(USPACE_PATH)/srv/bd/rd/rd \
         $(USPACE_PATH)/srv/vfs/vfs
@@ -107 +107 @@
         $(USPACE_PATH)/srv/hid/remcons/remcons \
         $(USPACE_PATH)/srv/net/ethip/ethip \
-        $(USPACE_PATH)/srv/net/inet/inet \
+        $(USPACE_PATH)/srv/net/inetsrv/inetsrv \
         $(USPACE_PATH)/srv/net/loopip/loopip \
         $(USPACE_PATH)/srv/net/tcp/tcp \
@@ -157 +157 @@
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/ext2info/ext2info \
-        $(USPACE_PATH)/app/inetcfg/inetcfg \
+        $(USPACE_PATH)/app/inet/inet \
         $(USPACE_PATH)/app/kill/kill \
         $(USPACE_PATH)/app/killall/killall \
-        $(USPACE_PATH)/app/locinfo/locinfo \
+        $(USPACE_PATH)/app/loc/loc \
         $(USPACE_PATH)/app/mkfat/mkfat \
         $(USPACE_PATH)/app/mkexfat/mkexfat \
@@ -177 +177 @@
         $(USPACE_PATH)/app/nettest3/nettest3 \
         $(USPACE_PATH)/app/netecho/netecho \
+        $(USPACE_PATH)/app/nterm/nterm \
         $(USPACE_PATH)/app/ping/ping \
         $(USPACE_PATH)/app/stats/stats \