User/Kernel - ARMv7 fixes (relocation of .text)

[tpg/acess2.git] / Usermode / Libraries / libc.so_src / Makefile

diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index c2979a0..fb3225b 100644 (file)
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -4,39 +4,18 @@
 -include ../Makefile.cfg\r
 \r
 CPPFLAGS += \r
-CFLAGS   += \r
+CFLAGS   += -Werror -Wextra\r
 ASFLAGS  +=\r
-LDFLAGS  += -soname libc.so.1 -Map map.txt\r
+LDFLAGS  += -soname libc.so -Map map.txt\r
 \r
-OBJ_LIBC = heap.o stdlib.o stub.o env.o fileIO.o string.o\r
-# signals.o\r
-BIN = ../libc.so.1\r
-\r
-.PHONY:        all clean\r
-\r
-all: $(BIN) $(OBJ_LIBC)\r
+INCFILES := stdio.h stdlib.h\r
 \r
-clean:\r
-       $(RM) $(BIN) $(OBJ_LIBC)\r
-\r
-# Core C Library\r
-$(BIN): $(OBJ_LIBC)\r
-       @echo --- ld -shared -o $@\r
-       @$(LD) $(LDFLAGS) $(OBJ_LIBC) -o $@\r
-       $(OBJDUMP) -d $@ > libc.so.1.dsm\r
-       $(OBJDUMP) -x -r -R $@ > libc.so.1.dmp\r
-       cp ../libc.so.1 ../libc.so\r
-       cp ../libc.so.1 $(DISTROOT)/Libs/\r
-\r
-# C Runtime 0\r
-../crt0.o: crt0.asm\r
-       @echo --- $(AS) -o $@\r
-       @$(AS) $(ASFLAGS) -o $@ $<\r
+OBJ  = stub.o heap.o stdlib.o env.o fileIO.o string.o select.o rand.o\r
+OBJ += perror.o scanf.o\r
+OBJ += arch/$(ARCHDIR).ao\r
+# signals.o\r
+DEPFILES := $(OBJ:%.o=%.d)\r
+BIN = libc.so\r
 \r
-$(filter %.o, $(OBJ_LIBC)): %.o: %.c config.h\r
-       @echo --- $(CC) -o $@\r
-       @$(CC) $(CFLAGS) -DBUILD_SO -o $@ -c $<\r
+include ../Makefile.tpl\r
 \r
-$(filter %.ao, $(OBJ_LIBC)): %.ao: %.asm\r
-       @echo --- $(AS) -o $@\r
-       @$(AS) $(ASFLAGS) -o $@ $<\r