Usermode/libc - Look ma! setjmp

[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 1e3fc46..8d9960c 100644 (file)
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -6,41 +6,19 @@
 CPPFLAGS += \r
 CFLAGS   += \r
 ASFLAGS  +=\r
-LDFLAGS  += -soname libc.so.1 -Map map.txt -lgcc\r
+LDFLAGS  += -soname libc.so -Map map.txt -lgcc\r
 \r
-OBJ = stub.o heap.o stdlib.o env.o fileIO.o string.o\r
-DEPFILES := $(OBJ:%.o=%.d)\r
+OBJ  = stub.o heap.o stdlib.o env.o fileIO.o string.o select.o\r
+OBJ += arch/$(ARCHDIR).ao\r
 # signals.o\r
-BIN = ../libc.so.1\r
-\r
-.PHONY:        all clean install\r
-\r
-all: $(BIN)\r
-\r
-clean:\r
-       $(RM) $(BIN) ../libc.so $(OBJ) $(DEPFILES) libc.so.1.dsm libc.so.1.dmp map.txt\r
+DEPFILES := $(OBJ:%.o=%.d)\r
+BIN = libc.so\r
 \r
-install: $(BIN)\r
-       $(xCP) ../libc.so.1 $(DISTROOT)/Libs/\r
+include ../Makefile.tpl\r
 \r
-# Core C Library\r
-$(BIN): $(OBJ)\r
-       @echo --- ld -shared -o $@\r
-       @$(LD) $(LDFLAGS) $(OBJ) -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
+#all: $(OUTPUTDIR)Libs/crt0.o\r
 \r
 # C Runtime 0\r
-../crt0.o: crt0.asm\r
-       @echo --- $(AS) -o $@\r
-       @$(AS) $(ASFLAGS) -o $@ $<\r
-\r
-$(filter %.o, $(OBJ)): %.o: %.c\r
-       @echo --- $(CC) -o $@\r
-       @$(CC) $(CFLAGS) -DBUILD_SO -o $@ -c $<\r
-       @$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $*.d $<\r
-\r
-$(filter %.ao, $(OBJ)): %.ao: %.asm\r
-       @echo --- $(AS) -o $@\r
-       @$(AS) $(ASFLAGS) -o $@ $<\r
+#$(OUTPUTDIR)Libs/crt0.o: crt0.asm\r
+#      @echo --- $(AS) -o $@\r
+#      @$(AS) $(ASFLAGS) -o $@ $<\r