From: Tormod Volden <debian.tormod@gmail.com>
Date: Thu, 4 Jun 2015 14:32:41 +0000 (+0200)
Subject: Generate liberror.txt because it is endian specific
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=6aa03ff59083b693f72b70ab3df0a343f0c2ef00;p=FUZIX.git

Generate liberror.txt because it is endian specific

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
---

diff --git a/Kernel/platform-dragon-nx32/README b/Kernel/platform-dragon-nx32/README
index 009b2071..3470099e 100644
--- a/Kernel/platform-dragon-nx32/README
+++ b/Kernel/platform-dragon-nx32/README
@@ -68,7 +68,6 @@ Quick build instructions
 make -C Kernel TARGET=dragon-nx32
 
 # 2. Build the libraries
-make -C Library tools/syscall_6809
 make -C Library/libs -f Makefile.6809
 
 # 3. Build the utils
diff --git a/Library/libs/Makefile b/Library/libs/Makefile
index 2fe30f4c..e9416cf7 100644
--- a/Library/libs/Makefile
+++ b/Library/libs/Makefile
@@ -66,7 +66,7 @@ OBJ_C = $(SRC_C:.c=.rel)
 OBJ_HARD = $(SRC_HARD:.c=.rel)
 OBJ_ALL = $(OBJ_ASM) $(OBJ_C) $(OBJ_HARD)
 
-all: syslib$(PLATFORM).lib crt0$(PLATFORM).rel crt0nostdio$(PLATFORM).rel
+all: syslib$(PLATFORM).lib crt0$(PLATFORM).rel crt0nostdio$(PLATFORM).rel liberror.txt
 
 libc.l:%.l:$(OBJ_ALL)
 	ls $(OBJ_ALL) > libc.l
@@ -90,6 +90,9 @@ fuzix/syslib.l:
 	../tools/syscall
 	make -C fuzix
 
+liberror.txt:
+	../tools/liberror > liberror.txt
+
 $(OBJ_ASM):%.rel: %.s
 	$(ASM) $(ASM_OPT) $@ $(@:.rel=.s)
 
@@ -106,5 +109,5 @@ $(OBJ_HARD):%.rel: %.c
 	$(CC) $(CC_NOOPT) $(@:.rel=.c)
 
 clean:
-	rm -rf *.rel *.asm *.sym *.lst *.lib *~ syscall.l  libc.l syslib.l
+	rm -rf *.rel *.asm *.sym *.lst *.lib *~ syscall.l  libc.l syslib.l liberror.txt
 	(cd fuzix; make clean)
diff --git a/Library/libs/Makefile.6502 b/Library/libs/Makefile.6502
index d7daa888..ad37ab4d 100644
--- a/Library/libs/Makefile.6502
+++ b/Library/libs/Makefile.6502
@@ -78,7 +78,7 @@ SRC_HARD += regexp.c
 OBJ_C = $(SRC_C:.c=.o)
 OBJ_ALL = $(OBJ_ASM) $(OBJ_C)
 
-all: syslib.lib crt0_6502.o
+all: syslib.lib liberror.txt crt0_6502.o
 
 fuzix6502/Makefile: ../tools/syscall_6502.c ../../Kernel/include/syscall_name.h
 	(cd ..; make tools/syscall_6502)
@@ -89,6 +89,9 @@ syslib.lib: fuzix6502/Makefile $(OBJ_C)
 	$(AR) a syslib.lib $(OBJ_C)
 	ln -sf syslib.lib c6502.lib
 
+liberror.txt:
+	../tools/liberror > liberror.txt
+
 $(OBJ_ASM):%.o: %.s
 	$(ASM) $(ASM_OPT) $@ $(@:.o=.s)
 
@@ -102,5 +105,5 @@ $(OBJ_HARD):%.o: %.c
 	$(CC) $(CC_NOOPT) $(@:.o=.c)
 
 clean:
-	rm -rf *.o *.lib *~ syscall.l  libc.l syslib.l
+	rm -rf *.o *.lib *~ syscall.l  libc.l syslib.l liberror.txt
 	(cd fuzix6502; make clean)
diff --git a/Library/libs/Makefile.6809 b/Library/libs/Makefile.6809
index 471e28b4..7c96c22a 100644
--- a/Library/libs/Makefile.6809
+++ b/Library/libs/Makefile.6809
@@ -59,7 +59,7 @@ OBJ_C = $(SRC_C:.c=.o)
 OBJ_HARD = $(SRC_HARD:.c=.o)
 OBJ_ALL = $(OBJ_ASM) $(OBJ_C) $(OBJ_HARD)
 
-all: syslib$(PLATFORM).lib $(OBJ_CRT0)
+all: syslib$(PLATFORM).lib liberror.txt $(OBJ_CRT0)
 
 libc.l:%.l:$(OBJ_ALL)
 	ls $(OBJ_ALL) > libc.l
@@ -74,10 +74,19 @@ syslib$(PLATFORM).lib: syscall.l libc.l
 	$(AR) -c syslib$(PLATFORM).lib $$(cat syslib.l)
 	ln -sf syslib$(PLATFORM).lib libc$(PLATFORM).a
 
-fuzix$(PLATFORM)/syslib.l:
-	../tools/syscall_$(PLATFORM)
+fuzix$(PLATFORM)/syslib.l: ../tools/syscall_$(PLATFORM)
+	$<
 	make -C fuzix$(PLATFORM)
 
+../tools/syscall_$(PLATFORM): ../tools/syscall_$(PLATFORM).c
+	make -C .. tools/syscall_$(PLATFORM)
+
+liberror.txt: ../tools/liberror
+	$< -X > $@
+
+../tools/liberror: ../tools/liberror.c
+	make -C .. tools/liberror
+
 $(OBJ_ASM):%.o: %.s
 	$(ASM) $(ASM_OPT) $@ $(@:.o=.s)
 
@@ -92,6 +101,6 @@ $(OBJ_HARD):%.o: %.c
 
 clean:
 	rm -rf *.o *.asm *.sym *.lst *.lib *~ syscall.l libc.l syslib.l \
-	libc$(PLATFORM).a
+	libc$(PLATFORM).a liberror.txt
 	-cd fuzix$(PLATFORM) && make clean
 	rm -rf fuzix$(PLATFORM)/Makefile
diff --git a/Standalone/filesystem-src/ucp-script.txt b/Standalone/filesystem-src/ucp-script.txt
index 0054cabc..aeac3b2d 100644
--- a/Standalone/filesystem-src/ucp-script.txt
+++ b/Standalone/filesystem-src/ucp-script.txt
@@ -26,7 +26,7 @@ chmod 0755 include
 mkdir share
 chmod 0755 share
 cd lib
-bget usr-files/lib/liberror.txt
+bget ../../Library/libs/liberror.txt
 chmod 0644 liberror.txt
 
 cd /var
diff --git a/Standalone/filesystem-src/usr-files/lib/liberror.txt b/Standalone/filesystem-src/usr-files/lib/liberror.txt
deleted file mode 100644
index 49d1b0e5..00000000
Binary files a/Standalone/filesystem-src/usr-files/lib/liberror.txt and /dev/null differ