Changeset 33c2952 in mainline for uspace/Makefile

Timestamp:

2012-11-07T21:00:02Z (14 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

dcb0751

Parents:

fc89e32 (diff), 94795812 (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:

Merged with mainline.

File:

• uspace/Makefile (modified) (9 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 \
@@ -95 +99 @@
         srv/bd/part/mbr_part \
         srv/fs/exfat \
+        srv/fs/udf \
         srv/fs/fat \
         srv/fs/cdfs \
@@ -132 +137 @@
         drv/nic/ne2k \
         drv/nic/e1k \
-        drv/nic/rtl8139
+        drv/nic/rtl8139 \
 
 ifeq ($(CONFIG_PCC),y)
@@ -161 +166 @@
                 drv/bus/isa \
                 drv/char/ns8250 \
+                drv/time/cmos-rtc \
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259
@@ -171 +177 @@
                 drv/bus/isa \
                 drv/char/ns8250 \
+                drv/time/cmos-rtc \
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259
@@ -213 +220 @@
         lib/usbhid \
         lib/usbvirt \
+        lib/bithenge \
         lib/posix