Changeset 89ac5513 in mainline for uspace/Makefile

Timestamp:

2013-06-23T19:54:53Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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:

• uspace/Makefile (modified) (3 diffs)

uspace/Makefile

@@ -39 +39 @@
         app/bnchmark \
         app/devctl \
+        app/dnscfg \
+        app/dnsres \
         app/edit \
         app/getterm \
@@ -82 +84 @@
         srv/devman \
         srv/loader \
+        srv/net/dnsrsrv \
         srv/net/ethip \
         srv/net/inetsrv \
@@ -135 +138 @@
         drv/nic/ne2k \
         drv/nic/e1k \
-        drv/nic/rtl8139 \
+        drv/nic/rtl8139
 
 ifeq ($(CONFIG_PCC),y)