Changeset 03362fbd in mainline for uspace/Makefile.common

Timestamp:

2013-02-09T23:14:45Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/Makefile.common (modified) (3 diffs)

uspace/Makefile.common

@@ -110 +110 @@
 LIBBLOCK_PREFIX = $(LIB_PREFIX)/block
 LIBFS_PREFIX = $(LIB_PREFIX)/fs
-LIBFB_PREFIX = $(LIB_PREFIX)/fb
 LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
 LIBFMTUTIL_PREFIX = $(LIB_PREFIX)/fmtutil
 
-LIBEXT2_PREFIX = $(LIB_PREFIX)/ext2
+LIBGRAPH_PREFIX = $(LIB_PREFIX)/graph
+LIBSOFTREND_PREFIX = $(LIB_PREFIX)/softrend
+LIBDRAW_PREFIX = $(LIB_PREFIX)/draw
+LIBGUI_PREFIX = $(LIB_PREFIX)/gui
+
+LIBEXT4_PREFIX = $(LIB_PREFIX)/ext4
 
 LIBUSB_PREFIX = $(LIB_PREFIX)/usb
@@ -130 +134 @@
 
 LIBSCSI_PREFIX = $(LIB_PREFIX)/scsi
+
+LIBBITHENGE_PREFIX = $(LIB_PREFIX)/bithenge
 
 ifeq ($(STATIC_NEEDED),y)
@@ -222 +228 @@
 
 ifeq ($(POSIX_COMPAT),y)
-        CFLAGS = -I$(LIBPOSIX_PREFIX)
+        CFLAGS = -I$(LIBPOSIX_PREFIX)/include/posix  -I$(LIBPOSIX_PREFIX)/include/
         LIBS += $(LIBPOSIX_PREFIX)/libposix.a
 endif