Changeset 2568c94 in mainline for boot/Makefile.common

Timestamp:

2012-08-17T17:15:19Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1789023

Parents:

4f351432 (diff), 01e397ac (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) (2 diffs)

boot/Makefile.common

@@ -152 +152 @@
         $(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 = \
@@ -196 +198 @@
         $(USPACE_PATH)/app/vdemo/vdemo \
         $(USPACE_PATH)/app/vlaunch/vlaunch \
-        $(USPACE_PATH)/app/vterm/vterm
+        $(USPACE_PATH)/app/vterm/vterm \
+        $(USPACE_PATH)/app/vdemo/vdemo
 
 ifeq ($(CONFIG_PCC),y)