Changeset b5e68c8 in mainline for uspace/app/tester/Makefile

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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/app/tester/Makefile (modified) (2 diffs)

uspace/app/tester/Makefile

@@ -38 +38 @@
         print/print3.c \
         print/print4.c \
+        print/print5.c \
         console/console1.c \
         stdio/stdio1.c \
@@ -46 +47 @@
         vfs/vfs1.c \
         ipc/ping_pong.c \
-        ipc/register.c \
-        ipc/connect.c \
         loop/loop1.c \
-        mm/malloc1.c
+        mm/malloc1.c \
+        mm/malloc2.c \
+        devs/devman1.c \
+        hw/misc/virtchar1.c \
+        hw/serial/serial1.c
 
 include $(USPACE_PREFIX)/Makefile.common