Changeset 1b11576d in mainline for uspace/Makefile
- Timestamp:
- 2010-10-23T16:04:12Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- c77b4d6
- Parents:
- 84c20da (diff), 58b833c (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
r84c20da r1b11576d 46 46 app/tasks \ 47 47 app/tester \ 48 app/test_serial \ 48 49 app/tetris \ 49 50 app/trace \ 50 51 app/top \ 52 app/netecho \ 53 app/nettest1 \ 54 app/nettest2 \ 55 app/ping \ 51 56 srv/clip \ 52 57 srv/devmap \ 58 srv/devman \ 53 59 srv/loader \ 54 60 srv/ns \ … … 81 87 srv/net/net \ 82 88 srv/net/netstart \ 83 app/netecho \ 84 app/nettest1 \ 85 app/nettest2 \ 86 app/ping 89 drv/root 87 90 88 91 ## Networking … … 107 110 108 111 ifeq ($(UARCH),amd64) 109 DIRS += srv/hw/bus/pci110 112 endif 111 113 112 114 ifeq ($(UARCH),ia32) 113 DIRS += srv/hw/bus/pci 115 DIRS += drv/rootia32 116 DIRS += drv/pciintel 117 DIRS += drv/isa 118 DIRS += drv/ns8250 114 119 endif 115 120 … … 134 139 lib/softint \ 135 140 lib/softfloat \ 141 lib/drv \ 136 142 lib/packet \ 137 143 lib/net 138 139 ifeq ($(UARCH),amd64)140 LIBS += lib/pci141 endif142 143 ifeq ($(UARCH),ia32)144 LIBS += lib/pci145 endif146 147 144 148 145 LIBC_BUILD = $(addsuffix .build,$(LIBC))
Note:
See TracChangeset
for help on using the changeset viewer.