Changeset 59ecd4a in mainline for uspace/Makefile.common

Timestamp:

2010-04-04T21:41:47Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5db9084

Parents:

36a75a2 (diff), ee7e82a9 (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.

File:

• uspace/Makefile.common (modified) (1 diff)

uspace/Makefile.common

@@ -77 +77 @@
 
 LIB_PREFIX = $(USPACE_PREFIX)/lib
-LIBC_PREFIX = $(USPACE_PREFIX)/lib/c
-LIBBLOCK_PREFIX = $(USPACE_PREFIX)/lib/block
-LIBFS_PREFIX = $(USPACE_PREFIX)/lib/fs
-LIBPCI_PREFIX = $(USPACE_PREFIX)/lib/pci
-SOFTFLOAT_PREFIX = $(USPACE_PREFIX)/lib/softfloat
-SOFTINT_PREFIX = $(USPACE_PREFIX)/lib/softint
 
-BASE_LIBS = $(LIBC_PREFIX)/libc.a $(SOFTINT_PREFIX)/libsoftint.a
+LIBC_PREFIX = $(LIB_PREFIX)/c
+LIBSOFTFLOAT_PREFIX = $(LIB_PREFIX)/softfloat
+LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint
+
+LIBBLOCK_PREFIX = $(LIB_PREFIX)/block
+LIBFS_PREFIX = $(LIB_PREFIX)/fs
+LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
+
+LIBPCI_PREFIX = $(LIB_PREFIX)/pci
+
+LIBSOCKET_PREFIX = $(LIB_PREFIX)/socket
+LIBNET_PREFIX = $(LIB_PREFIX)/net
+LIBNETIF_PREFIX = $(LIB_PREFIX)/netif
+
+BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
 
 LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld