Changeset 4f351432 in mainline for boot/Makefile.common

Timestamp:

2012-08-16T22:17:52Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

2568c94

Parents:

83298e8 (diff), 6d5e378 (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) (3 diffs)

boot/Makefile.common

@@ -89 +89 @@
 
 RD_SRVS_ESSENTIAL = \
-        $(USPACE_PATH)/srv/hid/fb/fb \
         $(USPACE_PATH)/srv/hid/input/input \
+        $(USPACE_PATH)/srv/hid/output/output \
         $(USPACE_PATH)/srv/hid/console/console \
-        $(USPACE_PATH)/srv/fs/locfs/locfs
+        $(USPACE_PATH)/srv/devman/devman \
+        $(USPACE_PATH)/srv/fs/locfs/locfs \
+        $(USPACE_PATH)/srv/hid/compositor/compositor
 
 RD_SRVS_NON_ESSENTIAL = \
@@ -114 +116 @@
         $(USPACE_PATH)/srv/net/tcp/tcp \
         $(USPACE_PATH)/srv/net/udp/udp \
-        $(USPACE_PATH)/srv/taskmon/taskmon \
-        $(USPACE_PATH)/srv/devman/devman
+        $(USPACE_PATH)/srv/taskmon/taskmon
 
 RD_DRVS = \
         infrastructure/root \
         infrastructure/rootvirt \
+        fb/kfb \
         test/test1 \
         test/test2 \
@@ -191 +193 @@
         $(USPACE_PATH)/app/mkbd/mkbd \
         $(USPACE_PATH)/app/websrv/websrv \
-        $(USPACE_PATH)/app/date/date
+        $(USPACE_PATH)/app/date/date \
+        $(USPACE_PATH)/app/vdemo/vdemo \
+        $(USPACE_PATH)/app/vlaunch/vlaunch \
+        $(USPACE_PATH)/app/vterm/vterm
 
 ifeq ($(CONFIG_PCC),y)