Changeset 5c96b2a in mainline for uspace/app/tester/Makefile

Timestamp:

2011-06-02T21:26:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ff4f073

Parents:

4a06045 (diff), 21300a2 (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 from ​http://ho.st.dcs.fmph.uniba.sk/~mato/bzr/helenos-ext2.

Changes made against the ext2 branch parent:

• removed .bzrignore
• removed all traces of pipefs

File:

• uspace/app/tester/Makefile (modified) (2 diffs)

uspace/app/tester/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
+LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBEXT2_PREFIX)/libext2.a
+EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBEXT2_PREFIX)
 BINARY = tester
 
 SOURCES = \
         tester.c \
+        util.c \
         thread/thread1.c \
         print/print1.c \
@@ -55 +58 @@
         devs/devman2.c \
         hw/misc/virtchar1.c \
-        hw/serial/serial1.c
+        hw/serial/serial1.c \
+        libext2/libext2_1.c
 
 include $(USPACE_PREFIX)/Makefile.common