Changeset 8048c648 in mainline for uspace/Makefile

Timestamp:

2011-01-14T10:08:47Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

f40a1e2

Parents:

44bb20b (diff), 6610565b (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 from /usb/development

File:

• uspace/Makefile (modified) (2 diffs)

uspace/Makefile

@@ -110 +110 @@
 
 ifeq ($(UARCH),amd64)
-        DIRS += drv/rootpc
-        DIRS += drv/pciintel
-        DIRS += drv/isa
-        DIRS += drv/ns8250
-        DIRS += drv/uhci
-        DIRS += drv/usbhub
-        DIRS += drv/usbkbd
-        DIRS += drv/vhc
+        DIRS += \
+                drv/rootpc \
+                drv/pciintel \
+                drv/isa \
+                drv/ns8250 \
+                srv/hw/irc/apic \
+                srv/hw/irc/i8259 \
+                drv/uhci \
+                drv/usbhub \
+                drv/usbkbd \
+                drv/vhc
 endif
 
 ifeq ($(UARCH),ia32)
-        DIRS += drv/rootpc
-        DIRS += drv/pciintel
-        DIRS += drv/isa
-        DIRS += drv/ns8250
-        DIRS += drv/uhci
-        DIRS += drv/usbhub
-        DIRS += drv/usbkbd
-        DIRS += drv/vhc
+        DIRS += \
+                drv/rootpc \
+                drv/pciintel \
+                drv/isa \
+                drv/ns8250 \
+                srv/hw/irc/apic \
+                srv/hw/irc/i8259 \
+                drv/uhci \
+                drv/usbhub \
+                drv/usbkbd \
+                drv/vhc
 endif
 
@@ -137 +143 @@
 ifeq ($(UARCH),sparc64)
         DIRS += \
-                srv/hw/cir/fhc \
-                srv/hw/cir/obio
+                srv/hw/irc/fhc \
+                srv/hw/irc/obio
 endif