Changeset f570cdf in mainline for uspace/Makefile

Timestamp:

2016-05-24T15:32:57Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c170438

Parents:

dcc150cb (diff), 0a981e3 (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 mainline

File:

• uspace/Makefile (modified) (4 diffs)

uspace/Makefile

@@ -41 +41 @@
         app/corecfg \
         app/devctl \
-        app/dltest \
         app/dnscfg \
         app/dnsres \
@@ -167 +166 @@
         drv/platform/icp
 
+
 ## Platform-specific hardware support
 #
@@ -210 +210 @@
                 drv/fb/amdm37x_dispc \
                 srv/hw/irc/icp-ic
+endif
+
+## Dynamic linking tests
+#
+ifeq ($(CONFIG_BUILD_SHARED_LIBS),y)
+        DIRS += \
+                app/dltest \
+                app/dltests
 endif
 
@@ -242 +250 @@
         lib/trackmod \
         lib/uri \
-        lib/urcu \
         lib/usb \
         lib/usbhost \