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

Timestamp:

2011-07-05T21:21:36Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5e2aa83, eb66f236

Parents:

3714e79 (diff), f7a55f9 (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

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBEXT2_PREFIX)/libext2.a
+LIBS = $(LIBEXT2_PREFIX)/libext2.a $(LIBBLOCK_PREFIX)/libblock.a
 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBEXT2_PREFIX)
 BINARY = tester
@@ -55 +55 @@
         mm/malloc2.c \
         mm/malloc3.c \
+        mm/mapping1.c \
         devs/devman1.c \
         devs/devman2.c \