scc

commit ea5689c219a25ed3c026764ef41894727393ddbc
parent 9b6ccd000cc147ffbfa7ca6b256300ffbc2bbbc7
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date:   Tue, 12 Dec 2017 07:53:03 +0000

[lib/c] Fix dependencies generation

There were several paths that were wrong.

Diffstat:
M
lib/c/target/amd64-sysv-linux-elf/Makefile
 | 
2
++
M
lib/c/target/amd64-sysv-linux-elf/gendep.sh
 | 
4
++--
M
lib/c/target/amd64-sysv-openbsd-elf/gendep.sh
 | 
4
++--
M
lib/c/target/common.mk
 | 
2
+-
M
lib/c/target/i386-sysv-linux-elf/gendep.sh
 | 
4
++--
M
lib/c/target/z80-scc-none-none/gendep.sh
 | 
4
++--

6 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/lib/c/target/amd64-sysv-linux-elf/Makefile b/lib/c/target/amd64-sysv-linux-elf/Makefile
@@ -3,3 +3,5 @@
 include ../../../../config.mk
 include ../objlst.mk
 include ../common.mk
+
+SCC_CFLAGS = -I../../include -I../../include/bits/amd64-sysv/
diff --git a/lib/c/target/amd64-sysv-linux-elf/gendep.sh b/lib/c/target/amd64-sysv-linux-elf/gendep.sh
@@ -9,8 +9,8 @@ trap "rm -f $$.mk" 0 2 3
 for i
 do
 	cat <<EOF
-$i: ../${i%.o}.c
-	\$(CC) \$(TF_CFLAGS) ../${i%.o}.c -c
+$i: ../../${i%.o}.c
+	\$(CC) \$(TF_CFLAGS) ../../${i%.o}.c -c
 
 EOF
 done) > $$.mk && mv $$.mk makefile
diff --git a/lib/c/target/amd64-sysv-openbsd-elf/gendep.sh b/lib/c/target/amd64-sysv-openbsd-elf/gendep.sh
@@ -9,8 +9,8 @@ trap "rm -f $$.mk" 0 2 3
 for i
 do
 	cat <<EOF
-$i: ../${i%.o}.c
-	\$(CC) \$(TF_CFLAGS) ../${i%.o}.c -c
+$i: ../../${i%.o}.c
+	\$(CC) \$(TF_CFLAGS) ../../${i%.o}.c -c
 
 EOF
 done) > $$.mk && mv $$.mk makefile
diff --git a/lib/c/target/common.mk b/lib/c/target/common.mk
@@ -6,7 +6,7 @@ libc.a: $(OBJ)
 	ranlib $@
 
 dep:
-	gendep.sh
+	gendep.sh $(OBJ)
 
 clean:
 	rm -f *.o
diff --git a/lib/c/target/i386-sysv-linux-elf/gendep.sh b/lib/c/target/i386-sysv-linux-elf/gendep.sh
@@ -9,8 +9,8 @@ trap "rm -f $$.mk" 0 2 3
 for i
 do
 	cat <<EOF
-$i: ../${i%.o}.c
-	\$(CC) \$(TF_CFLAGS) ../${i%.o}.c -c
+$i: ../../${i%.o}.c
+	\$(CC) \$(TF_CFLAGS) ../../${i%.o}.c -c
 
 EOF
 done) > $$.mk && mv $$.mk makefile
diff --git a/lib/c/target/z80-scc-none-none/gendep.sh b/lib/c/target/z80-scc-none-none/gendep.sh
@@ -9,8 +9,8 @@ trap "rm -f $$.mk" 0 2 3
 for i
 do
 	cat <<EOF
-$i: ../${i%.o}.c
-	\$(CC) \$(TF_CFLAGS) ../${i%.o}.c -c
+$i: ../../${i%.o}.c
+	\$(CC) \$(TF_CFLAGS) ../../${i%.o}.c -c
 
 EOF
 done) > $$.mk && mv $$.mk makefile