git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed keyboard bug where keypresses were not being registered, working on libreadline
[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
293f783
..
1e3fc46
100644
(file)
--- a/
Usermode/Libraries/libc.so_src/Makefile
+++ b/
Usermode/Libraries/libc.so_src/Makefile
@@
-1,46
+1,46
@@
-# Acess
OS
Basic C Library
\r
+# Acess
2
Basic C Library
\r
# Makefile
\r
\r
# Makefile
\r
\r
-CC = gcc
\r
-AS = nasm
\r
-RM = @rm -f
\r
-LD = ld
\r
-OBJDUMP = objdump
\r
-ACESSDIR = /home/hodgeja/Projects/Acess2
\r
+-include ../Makefile.cfg
\r
\r
\r
-CPPFLAGS
= -I$(ACESSDIR)/Usermode/include
\r
-CFLAGS
= -Wall -fPIC -fno-builtin -fno-stack-protector $(CPPFLAGS)
\r
-ASFLAGS
= -felf
\r
-LDFLAGS
= -x -shared -soname libc.so.1 -Map map.txt -e SoMain -L$(ACESSDIR)/Usermode/Libraries -lacess
\r
+CPPFLAGS
+=
\r
+CFLAGS
+=
\r
+ASFLAGS
+=
\r
+LDFLAGS
+= -soname libc.so.1 -Map map.txt -lgcc
\r
\r
\r
-OBJ_LIBC = heap.o stdlib.o stub.o env.o fileIO.o signals.o
\r
+OBJ = stub.o heap.o stdlib.o env.o fileIO.o string.o
\r
+DEPFILES := $(OBJ:%.o=%.d)
\r
+# signals.o
\r
BIN = ../libc.so.1
\r
\r
BIN = ../libc.so.1
\r
\r
-.PHONY: all clean
\r
+.PHONY: all clean
install
\r
\r
\r
-all: $(BIN)
$(OBJ_LIBC)
\r
+all: $(BIN)
\r
\r
clean:
\r
\r
clean:
\r
- $(RM) $(BIN) $(OBJ_LIBC)
\r
+ $(RM) $(BIN) ../libc.so $(OBJ) $(DEPFILES) libc.so.1.dsm libc.so.1.dmp map.txt
\r
+
\r
+install: $(BIN)
\r
+ $(xCP) ../libc.so.1 $(DISTROOT)/Libs/
\r
\r
# Core C Library
\r
\r
# Core C Library
\r
-$(BIN): $(OBJ
_LIBC
)
\r
+$(BIN): $(OBJ)
\r
@echo --- ld -shared -o $@
\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
+ @$(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
cp ../libc.so.1 ../libc.so
\r
- cp ../libc.so.1 /mnt/AcessHDD/Acess2/Libs/
\r
\r
# C Runtime 0
\r
../crt0.o: crt0.asm
\r
@echo --- $(AS) -o $@
\r
@$(AS) $(ASFLAGS) -o $@ $<
\r
\r
\r
# C Runtime 0
\r
../crt0.o: crt0.asm
\r
@echo --- $(AS) -o $@
\r
@$(AS) $(ASFLAGS) -o $@ $<
\r
\r
-$(filter %.o, $(OBJ
_LIBC)): %.o: %.c config.h
\r
+$(filter %.o, $(OBJ
)): %.o: %.c
\r
@echo --- $(CC) -o $@
\r
@$(CC) $(CFLAGS) -DBUILD_SO -o $@ -c $<
\r
@echo --- $(CC) -o $@
\r
@$(CC) $(CFLAGS) -DBUILD_SO -o $@ -c $<
\r
+ @$(MAKEDEP) $(CPPFLAGS) -MT $@ -o $*.d $<
\r
\r
\r
-$(filter %.ao, $(OBJ
_LIBC
)): %.ao: %.asm
\r
+$(filter %.ao, $(OBJ)): %.ao: %.asm
\r
@echo --- $(AS) -o $@
\r
@$(AS) $(ASFLAGS) -o $@ $<
\r
@echo --- $(AS) -o $@
\r
@$(AS) $(ASFLAGS) -o $@ $<
\r
UCC
git Repository :: git.ucc.asn.au