Changeset 1faa995 in mainline

Timestamp:

2010-03-26T22:15:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5da468e

Parents:

12d7710

Message:

Fix SBI build w.r.t. mainline changes.

Location:

uspace/app/sbi

Files:

• Makefile (modified) (2 diffs)
• src/input.c (modified) (1 diff)
• src/lex.c (modified) (1 diff)
• src/os/helenos.c (modified) (1 diff)
• src/strtab.c (modified) (1 diff)

uspace/app/sbi/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBC_PREFIX)/libc.a
 EXTRA_CFLAGS = -D__HELENOS__
 
-OUTPUT = sbi
+BINARY = sbi
 
 SOURCES = \
@@ -59 +58 @@
         src/tdata.c
 
-include ../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common

uspace/app/sbi/src/input.c

@@ -34 +34 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include "mytypes.h"
 #include "strtab.h"

uspace/app/sbi/src/lex.c

@@ -34 +34 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include "mytypes.h"
 #include "input.h"

uspace/app/sbi/src/os/helenos.c

@@ -32 +32 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <task.h>
 

uspace/app/sbi/src/strtab.c

@@ -35 +35 @@
 
 #include <stdlib.h>
-#include <string.h>
 #include "mytypes.h"
 #include "os/os.h"