Changeset 03362fbd in mainline for uspace/app/tester/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/app/tester/Makefile (modified) (3 diffs)

uspace/app/tester/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBEXT2_PREFIX)/libext2.a $(LIBBLOCK_PREFIX)/libblock.a
-EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBEXT2_PREFIX)
+LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
+EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBSOFTFLOAT_PREFIX)
 BINARY = tester
 
@@ -42 +42 @@
         print/print4.c \
         print/print5.c \
+        print/print6.c \
         console/console1.c \
         stdio/stdio1.c \
         stdio/stdio2.c \
+        stdio/logger1.c \
+        stdio/logger2.c \
         fault/fault1.c \
         fault/fault2.c \
         fault/fault3.c \
+        float/float1.c \
+        float/softfloat1.c \
         vfs/vfs1.c \
         ipc/ping_pong.c \
@@ -58 +63 @@
         mm/mapping1.c \
         hw/misc/virtchar1.c \
-        hw/serial/serial1.c \
-        libext2/libext2_1.c
+        hw/serial/serial1.c
 
 include $(USPACE_PREFIX)/Makefile.common