Changeset 33fee91 in mainline for boot/Makefile.common

Timestamp:

2012-08-31T07:35:27Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a3da2b2

Parents:

72cf064 (diff), 0d57c3e (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) (5 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 = \
@@ -105 +107 @@
         $(USPACE_PATH)/srv/fs/cdfs/cdfs \
         $(USPACE_PATH)/srv/fs/exfat/exfat \
+        $(USPACE_PATH)/srv/fs/udf/udf \
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
         $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
         $(USPACE_PATH)/srv/hid/remcons/remcons \
+        $(USPACE_PATH)/srv/hid/isdv4_tablet/isdv4_tablet \
         $(USPACE_PATH)/srv/net/ethip/ethip \
         $(USPACE_PATH)/srv/net/inetsrv/inetsrv \
@@ -113 +117 @@
         $(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 \
@@ -149 +153 @@
         $(USPACE_PATH)/app/bdsh/bdsh \
         $(USPACE_PATH)/app/getterm/getterm \
-        $(USPACE_PATH)/app/klog/klog
+        $(USPACE_PATH)/app/klog/klog \
+        $(USPACE_PATH)/app/vlaunch/vlaunch \
+        $(USPACE_PATH)/app/vterm/vterm
 
 RD_APPS_NON_ESSENTIAL = \
@@ -189 +195 @@
         $(USPACE_PATH)/app/vuhid/vuh \
         $(USPACE_PATH)/app/mkbd/mkbd \
-        $(USPACE_PATH)/app/websrv/websrv
+        $(USPACE_PATH)/app/websrv/websrv \
+        $(USPACE_PATH)/app/vdemo/vdemo
 
 ifeq ($(CONFIG_PCC),y)