Changeset 25eec4e in mainline for uspace/drv/fb/amdm37x_dispc/Makefile

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

• uspace/drv/fb/amdm37x_dispc/Makefile (moved) (moved from uspace/srv/fs/ext2fs/Makefile ) (2 diffs)

uspace/drv/fb/amdm37x_dispc/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.
 #
@@ -30 +30 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a $(LIBEXT2_PREFIX)/libext2.a
-EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX) -I$(LIBEXT2_PREFIX)
-BINARY = ext2fs
+
+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 = amdm37x_dispc
 
 SOURCES = \
-        ext2fs.c \
-        ext2fs_ops.c
+        amdm37x_dispc.c \
+        main.c
 
 include $(USPACE_PREFIX)/Makefile.common