Changeset 03362fbd in mainline for uspace/drv/fb/kfb/Makefile

Timestamp:

2013-02-09T23:14:45Z (13 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/drv/fb/kfb/Makefile (moved) (moved from uspace/lib/ext2/Makefile ) (2 diffs)

uspace/drv/fb/kfb/Makefile

@@ -2 +2 @@
 # Copyright (c) 2005 Martin Decky
 # Copyright (c) 2007 Jakub Jermar
-# Copyright (c) 2010 Martin Sucha
+# Copyright (c) 2011 Petr Koupy
 # All rights reserved.
 #
@@ -29 +29 @@
 #
 
-USPACE_PREFIX = ../..
-LIBRARY = libext2
-EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a
+USPACE_PREFIX = ../../..
+LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBGRAPH_PREFIX)/libgraph.a $(LIBSOFTREND_PREFIX)/libsoftrend.a
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBGRAPH_PREFIX) -I$(LIBSOFTREND_PREFIX)
+BINARY = kfb
 
 SOURCES = \
-        libext2_filesystem.c \
-        libext2_superblock.c \
-        libext2_block_group.c \
-        libext2_inode.c \
-        libext2_directory.c
+        port.c \
+        kfb.c
 
 include $(USPACE_PREFIX)/Makefile.common