Changes in uspace/Makefile [caa8a94:966acede] in mainline

File:

• uspace/Makefile (modified) (4 diffs)

uspace/Makefile

@@ -50 +50 @@
         app/trace \
         app/top \
+        app/usbinfo \
+        app/virtusbkbd \
+        app/virtusbhub \
         app/netecho \
         app/nettest1 \
@@ -113 +116 @@
                 drv/ns8250 \
                 srv/hw/irc/apic \
-                srv/hw/irc/i8259
+                srv/hw/irc/i8259 \
+                drv/ehci-hcd \
+                drv/ohci \
+                drv/uhci-hcd \
+                drv/uhci-rhd \
+                drv/usbflbk \
+                drv/usbkbd \
+                drv/usbhid \
+                drv/usbhub \
+                drv/usbmid \
+                drv/usbmouse \
+                drv/vhc
 endif
 
@@ -123 +137 @@
                 drv/ns8250 \
                 srv/hw/irc/apic \
-                srv/hw/irc/i8259
+                srv/hw/irc/i8259 \
+                drv/ehci-hcd \
+                drv/ohci \
+                drv/uhci-hcd \
+                drv/uhci-rhd \
+                drv/usbflbk \
+                drv/usbkbd \
+                drv/usbhid \
+                drv/usbhub \
+                drv/usbmid \
+                drv/usbmouse \
+                drv/vhc
 endif
 
@@ -150 +175 @@
         lib/net
 
+ifeq ($(UARCH),amd64)
+        LIBS += lib/usb
+        LIBS += lib/usbvirt
+endif
+
+ifeq ($(UARCH),ia32)
+        LIBS += lib/usb
+        LIBS += lib/usbvirt
+endif
+
 LIBC_BUILD = $(addsuffix .build,$(LIBC))
 LIBS_BUILD = $(addsuffix .build,$(LIBS))