X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2FCLIShell_src%2FMakefile;h=a87f3298affeb9bec5246c61b808135cf797653d;hb=9d3800f60f2212432e550a4e003ae65b498a4d36;hp=a79952e7a9e3ac6572d63dea11901d65c66f69da;hpb=51adc08a1e11fe9e5389e6e7c3e3a4ea4973917b;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/CLIShell_src/Makefile b/Usermode/Applications/CLIShell_src/Makefile
index a79952e7..a87f3298 100644
--- a/Usermode/Applications/CLIShell_src/Makefile
+++ b/Usermode/Applications/CLIShell_src/Makefile
@@ -1,36 +1,27 @@
 # Project: Acess Shell
 
-CC = gcc
-AS = nasm
-LD = ld
-RM = @rm -f
+-include ../Makefile.cfg
 
-COBJ = main.o lib.o
-BIN = ../CLIShell
-ACESSDIR = /home/hodgeja/Projects/Acess2/Usermode
+CPPFLAGS += -I./include
+CFLAGS   += -Wall -fno-builtin -fno-stack-protector
+LDFLAGS  += 
 
-INCS = -I$(ACESSDIR)/include -I./include
-CFLAGS = -Wall -fno-builtin -fno-stack-protector $(INCS)
-ASFLAGS = -felf
-LDFLAGS = -T $(ACESSDIR)/Libraries/acess.ld -I /Acess/Libs/ld-acess.so -lc
+BIN = ../CLIShell
+COBJ = main.o lib.o
 
 .PHONY : all clean
 
 all: $(BIN)
 
-$(BIN): $(AOBJ) $(COBJ)
+clean:
+	$(RM) $(COBJ) $(BIN)
+
+$(BIN): $(COBJ)
 	@echo --- $(LD) -o $@
-	@$(LD) $(LDFLAGS) -o $@ $(AOBJ) $(COBJ) -Map Map.txt
+	@$(LD) $(LDFLAGS) -o $@ $(COBJ) -Map Map.txt
 	objdump -d $(BIN) > $(BIN).dsm
-	cp $(BIN) /mnt/AcessHDD/Acess2/Bin/
-
-clean:
-	$(RM) $(AOBJ) $(COBJ) $(BIN)
+	cp $(BIN) $(DISTROOT)/Bin/
 
 $(COBJ): %.o: %.c
 	@echo --- GCC -o $@
 	@$(CC) $(CFLAGS) -c $? -o $@
-
-$(AOBJ): %.ao: %.asm
-	@echo --- $(AS) -o $@
-	@$(AS) $(ASFLAGS) -o $@ $<