Changeset b0f00a9 in mainline for uspace/app/bdsh/Makefile

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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/bdsh/Makefile (modified) (2 diffs)

uspace/app/bdsh/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBCLUI_PREFIX)/libclui.a
-EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBCLUI_PREFIX) -I. -Icmds/ \
-        -Icmds/builtins -Icmds/modules
+LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBCLUI_PREFIX)/libclui.a \
+        $(LIBFMTUTIL_PREFIX)/libfmtutil.a
+EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBCLUI_PREFIX) \
+        -I$(LIBFMTUTIL_PREFIX) -I. -Icmds/ -Icmds/builtins -Icmds/modules
 BINARY = bdsh
 
@@ -50 +51 @@
         cmds/modules/unmount/unmount.c \
         cmds/modules/kcon/kcon.c \
+        cmds/builtins/batch/batch.c \
         cmds/builtins/exit/exit.c \
         cmds/builtins/cd/cd.c \
         cmds/mod_cmds.c \
         cmds/builtin_cmds.c \
+        compl.c \
         errors.c \
         input.c \
         util.c \
         exec.c \
-        scli.c
+        scli.c \
+        tok.c
 
 include $(USPACE_PREFIX)/Makefile.common