Changeset e4f8c77 in mainline for uspace/Makefile
- Timestamp:
- 2011-07-13T22:39:18Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- e6910c8
- Parents:
- 5974661 (diff), 8ecef91 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/Makefile
r5974661 re4f8c77 85 85 srv/fs/devfs \ 86 86 srv/fs/ext2fs \ 87 srv/hid/adb_mouse \88 srv/hid/char_mouse \89 87 srv/hid/s3c24xx_ts \ 90 88 srv/hid/fb \ 91 srv/hid/ kbd\89 srv/hid/input \ 92 90 srv/hw/char/i8042 \ 93 91 srv/hw/char/s3c24xx_uart \ … … 100 98 srv/net/tl/tcp \ 101 99 srv/net/net \ 102 drv/ root \103 drv/ rootvirt \104 drv/test 1 \105 drv/test 2 \106 drv/test 3 \107 drv/ ehci_hcd\108 drv/ ohci \109 drv/ uhci_hcd\110 drv/ uhci_rhd\111 drv/ usbflbk \112 drv/ usbhid \113 drv/ usbhub \114 drv/ usbmast \115 drv/ usbmid \116 drv/ usbmouse \117 drv/ vhc100 drv/infrastructure/root \ 101 drv/infrastructure/rootvirt \ 102 drv/test/test1 \ 103 drv/test/test2 \ 104 drv/test/test3 \ 105 drv/bus/usb/ehci \ 106 drv/bus/usb/ohci \ 107 drv/bus/usb/uhci \ 108 drv/bus/usb/uhcirh \ 109 drv/bus/usb/usbflbk \ 110 drv/bus/usb/usbhid \ 111 drv/bus/usb/usbhub \ 112 drv/bus/usb/usbmast \ 113 drv/bus/usb/usbmid \ 114 drv/bus/usb/usbmouse \ 115 drv/bus/usb/vhc 118 116 119 117 ## Networking … … 133 131 ifeq ($(UARCH),amd64) 134 132 DIRS += \ 135 drv/ rootpc \136 drv/ pciintel \137 drv/ isa \138 drv/ ns8250 \133 drv/infrastructure/rootpc \ 134 drv/bus/pci/pciintel \ 135 drv/bus/isa \ 136 drv/char/ns8250 \ 139 137 srv/hw/irc/apic \ 140 138 srv/hw/irc/i8259 … … 143 141 ifeq ($(UARCH),ia32) 144 142 DIRS += \ 145 drv/ rootpc \146 drv/ pciintel \147 drv/ isa \148 drv/ ns8250 \143 drv/infrastructure/rootpc \ 144 drv/bus/pci/pciintel \ 145 drv/bus/isa \ 146 drv/char/ns8250 \ 149 147 srv/hw/irc/apic \ 150 148 srv/hw/irc/i8259 … … 152 150 153 151 ifeq ($(UARCH),ppc32) 154 DIRS += srv/hw/bus/cuda_adb 152 DIRS += \ 153 drv/infrastructure/rootmac \ 154 srv/hw/bus/cuda_adb 155 155 endif 156 156 157 157 ifeq ($(UARCH),sparc64) 158 158 DIRS += \ 159 srv/hw/irc/fhc \160 159 srv/hw/irc/obio 161 160 endif … … 169 168 lib/block \ 170 169 lib/clui \ 170 lib/scsi \ 171 171 lib/softint \ 172 172 lib/softfloat \
Note:
See TracChangeset
for help on using the changeset viewer.