Changeset 4fe3b6d in mainline for boot/Makefile.common

Timestamp:

2011-05-20T11:07:00Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

8bb61e6

Parents:

3476be8 (diff), 7941bd6 (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 with development

File:

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

boot/Makefile.common

@@ -118 +118 @@
 RD_DRV_CFG = 
 
+RD_LIBS =
+
+ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
+        RD_LIBS += \
+                $(USPACE_PATH)/lib/c/libc.so0 \
+                $(USPACE_PATH)/lib/softint/libsofti.so0
+        RD_APPS += \
+                $(USPACE_PATH)/app/dltest/dltest
+endif
+
 RD_APPS_ESSENTIAL = \
         $(USPACE_PATH)/app/bdsh/bdsh \
@@ -124 +134 @@
 
 RD_APPS_NON_ESSENTIAL = \
+        $(USPACE_PATH)/app/dltest/dltest \
+        $(USPACE_PATH)/app/dltest2/dltest2 \
+        $(USPACE_PATH)/app/dload/dload \
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/kill/kill \
@@ -144 +157 @@
         $(USPACE_PATH)/app/usbinfo/usbinfo \
         $(USPACE_PATH)/app/vuhid/vuh \
+        $(USPACE_PATH)/app/mkbd/mkbd \
         $(USPACE_PATH)/app/websrv/websrv