Changeset b800b0e in mainline for uspace/Makefile

Timestamp:

2012-10-23T13:16:49Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6ecf5b8

Parents:

32b3a12 (diff), b2ac3998 (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) (8 diffs)

uspace/Makefile

@@ -35 +35 @@
 DIRS = \
         app/bdsh \
+        app/bithenge \
         app/blkdump \
         app/bnchmark \
@@ -47 +48 @@
         app/klog \
         app/loc \
+        app/logset \
         app/mkfat \
         app/mkexfat \
@@ -71 +73 @@
         app/sysinfo \
         app/mkbd \
+        app/date \
         app/websrv \
         app/vdemo \
@@ -77 +80 @@
         srv/clipboard \
         srv/locsrv \
+        srv/logger \
         srv/devman \
         srv/loader \
@@ -133 +137 @@
         drv/nic/ne2k \
         drv/nic/e1k \
-        drv/nic/rtl8139
+        drv/nic/rtl8139 \
 
 ifeq ($(CONFIG_PCC),y)
@@ -162 +166 @@
                 drv/bus/isa \
                 drv/char/ns8250 \
+                drv/time/cmos-rtc \
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259
@@ -172 +177 @@
                 drv/bus/isa \
                 drv/char/ns8250 \
+                drv/time/cmos-rtc \
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259
@@ -214 +220 @@
         lib/usbhid \
         lib/usbvirt \
+        lib/bithenge \
         lib/posix