Changeset 3f03199 in mainline for uspace/Makefile

Timestamp:

2013-09-15T06:33:53Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/Makefile (modified) (9 diffs)

uspace/Makefile

@@ -38 +38 @@
         app/blkdump \
         app/bnchmark \
+        app/corecfg \
         app/devctl \
         app/dnscfg \
         app/dnsres \
+        app/download \
         app/edit \
         app/getterm \
@@ -49 +51 @@
         app/klog \
         app/loc \
+        app/logset \
         app/mixerctl \
-        app/logset \
         app/mkfat \
         app/mkexfat \
@@ -69 +71 @@
         app/vuhid \
         app/netecho \
+        app/netspeed \
         app/nettest1 \
         app/nettest2 \
@@ -76 +79 @@
         app/sysinfo \
         app/mkbd \
-        app/wavplay \
         app/date \
-        app/websrv \
-        srv/audio/hound \
         app/vdemo \
         app/vlaunch \
         app/vterm \
+        app/df \
+        app/wavplay \
+        app/websrv \
+        srv/audio/hound \
         srv/clipboard \
         srv/locsrv \
@@ -88 +92 @@
         srv/devman \
         srv/loader \
+        srv/net/dhcp \
         srv/net/dnsrsrv \
         srv/net/ethip \
@@ -119 +124 @@
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
+        srv/hid/rfb \
         drv/audio/sb16 \
         drv/infrastructure/root \
@@ -187 +193 @@
 endif
 
+ifeq ($(UARCH), $(filter $(UARCH),mips32 mips32eb))
+        DIRS += \
+                drv/infrastructure/rootmalta \
+                drv/bus/pci/pciintel \
+                drv/bus/isa
+endif
+
 ifeq ($(UARCH),ppc32)
         DIRS += \
@@ -218 +231 @@
         lib/softfloat \
         lib/drv \
-        lib/hound \
         lib/graph \
         lib/gui \
+        lib/hound \
+        lib/http \
         lib/softrend \
         lib/draw \
@@ -226 +240 @@
         lib/nic \
         lib/ext4 \
+        lib/uri \
         lib/usb \
         lib/usbhost \