Changeset 46c20c8 in mainline for uspace/app/tester/Makefile

Timestamp:

2010-11-26T20:08:10Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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) (3 diffs)

uspace/app/tester/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBC_PREFIX)/libc.a
-
-OUTPUT = tester
+BINARY = tester
 
 SOURCES = \
@@ -40 +38 @@
         print/print3.c \
         print/print4.c \
+        print/print5.c \
         console/console1.c \
         stdio/stdio1.c \
@@ -51 +50 @@
         ipc/connect.c \
         loop/loop1.c \
-        mm/malloc1.c
+        mm/malloc1.c \
+        hw/serial/serial1.c
 
-include ../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common