From 5c46f86c5a8ceaa63a1a9919cf1f4d2889c6c233 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sat, 26 Dec 2009 23:57:58 +0800 Subject: [PATCH] Updated the build files to use $(xCP), allows use of mcopy to a mtools disk --- Kernel/Makefile | 2 +- Kernel/Makefile.BuildNum | 2 +- Makefile.cfg | 7 +++- Modules/Makefile.tpl | 2 +- Modules/USB/main.c | 2 +- Usermode/Applications/CLIShell_src/Makefile | 2 +- Usermode/Applications/cat_src/Makefile | 46 ++++++++++----------- Usermode/Applications/ifconfig_src/Makefile | 2 +- Usermode/Applications/init_src/Makefile | 4 +- Usermode/Applications/login_src/Makefile | 2 +- Usermode/Applications/ls_src/Makefile | 46 ++++++++++----------- Usermode/Applications/mount_src/Makefile | 46 ++++++++++----------- Usermode/Libraries/ld-acess.so_src/Makefile | 2 +- Usermode/Libraries/libacess.so_src/Makefile | 2 +- Usermode/Libraries/libc.so_src/Makefile | 2 +- Usermode/Libraries/libgcc.so_src/Makefile | 2 +- 16 files changed, 87 insertions(+), 84 deletions(-) diff --git a/Kernel/Makefile b/Kernel/Makefile index 778d3d86..17616e72 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -52,7 +52,7 @@ $(BIN): $(OBJ) $(MODS) arch/$(ARCHDIR)/link.ld Makefile @echo --- LD -o $(BIN) @$(LD) $(LDFLAGS) -o $(BIN) $(OBJ) $(MODS) -Map ../Map.$(ARCH).txt @objdump $(BIN) -D > $(BIN).dsm - cp $(BIN) $(DISTROOT) + $(xCP) $(BIN) $(DISTROOT) @wc -l $(SRCFILES) > LineCounts.$(ARCH).txt @echo BUILD_NUM = `calc $(BUILD_NUM)+1` > Makefile.BuildNum diff --git a/Kernel/Makefile.BuildNum b/Kernel/Makefile.BuildNum index f5a0a805..b4ec2fa7 100644 --- a/Kernel/Makefile.BuildNum +++ b/Kernel/Makefile.BuildNum @@ -1 +1 @@ -BUILD_NUM = 1068 +BUILD_NUM = 1073 diff --git a/Makefile.cfg b/Makefile.cfg index b2cb47d1..3a164ee6 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -10,6 +10,8 @@ RM = @rm -f STRIP = strip MKDIR = mkdir RMDIR = rm -rf +lCP = cp +xCP = mcopy -D o ARCH = i386 ARCHDIR = x86 @@ -19,5 +21,6 @@ DRIVERS = ata_x86 MODULES = FS_Ext2 FDD NE2000 BochsGA #DISTROOT = /mnt/AcessHDD/Acess2 -DISTROOT = ~/Projects/Acess2/Filesystem -ACESSDIR = ~/Projects/Acess2 +#DISTROOT = ~/Projects/Acess2/Filesystem +DISTROOT = a:/Acess2 +ACESSDIR = /home/hodgeja/Projects/Acess2 diff --git a/Modules/Makefile.tpl b/Modules/Makefile.tpl index 0ceb7838..8a09edbe 100644 --- a/Modules/Makefile.tpl +++ b/Modules/Makefile.tpl @@ -28,7 +28,7 @@ $(BIN): $(OBJ) @$(LD) -T ../link.ld -shared -nostdlib -o $@ $(OBJ) # @$(LD) -shared -nostdlib -o $@ $(OBJ) @$(OBJDUMP) -d $(BIN) > $(BIN).dsm - cp $@ $(DISTROOT)/Modules/$(NAME).kmd + $(xCP) $@ $(DISTROOT)/Modules/$(NAME).kmd @echo --- $(LD) -o $(KOBJ) @$(CC) -Wl,-r -nostdlib -o $(KOBJ) $(OBJ) diff --git a/Modules/USB/main.c b/Modules/USB/main.c index 0bdcc246..7276d0e7 100644 --- a/Modules/USB/main.c +++ b/Modules/USB/main.c @@ -44,7 +44,7 @@ int USB_Install(char **Arguments) { UHCI_Initialise(); Warning("[USB ] Not Complete - Devel Only"); - return 0; + return 1; } /** diff --git a/Usermode/Applications/CLIShell_src/Makefile b/Usermode/Applications/CLIShell_src/Makefile index 93c58f72..ca2d9889 100644 --- a/Usermode/Applications/CLIShell_src/Makefile +++ b/Usermode/Applications/CLIShell_src/Makefile @@ -20,7 +20,7 @@ $(BIN): $(COBJ) @echo --- $(LD) -o $@ @$(LD) $(LDFLAGS) -o $@ $(COBJ) -Map Map.txt objdump -d $(BIN) > $(BIN).dsm - cp $(BIN) $(DISTROOT)/Bin/ + $(xCP) $(BIN) $(DISTROOT)/Bin/ $(COBJ): %.o: %.c @echo --- GCC -o $@ diff --git a/Usermode/Applications/cat_src/Makefile b/Usermode/Applications/cat_src/Makefile index bc57a4ca..9fe79a65 100644 --- a/Usermode/Applications/cat_src/Makefile +++ b/Usermode/Applications/cat_src/Makefile @@ -1,27 +1,27 @@ -# Project: cat - --include ../Makefile.cfg - +# Project: cat + +-include ../Makefile.cfg + COBJ = main.o -BIN = ../cat - -CFLAGS += -Wall -fno-builtin -fno-stack-protector -LDFLAGS += - -.PHONY : all clean - -all: $(BIN) - -$(BIN): $(COBJ) - @echo --- $(LD) -o $@ - @$(LD) $(LDFLAGS) -o $@ $(COBJ) -Map Map.txt - objdump -d $(BIN) > $(BIN).dsm - cp $(BIN) $(DISTROOT)/Bin/ - -clean: +BIN = ../cat + +CFLAGS += -Wall -fno-builtin -fno-stack-protector +LDFLAGS += + +.PHONY : all clean + +all: $(BIN) + +$(BIN): $(COBJ) + @echo --- $(LD) -o $@ + @$(LD) $(LDFLAGS) -o $@ $(COBJ) -Map Map.txt + objdump -d $(BIN) > $(BIN).dsm + $(xCP) $(BIN) $(DISTROOT)/Bin/ + +clean: $(RM) $(COBJ) $(BIN) $(BIN).dsm Map.txt - -$(COBJ): %.o: %.c + +$(COBJ): %.o: %.c @echo --- GCC -o $@ @$(CC) $(CFLAGS) -c $? -o $@ - + diff --git a/Usermode/Applications/ifconfig_src/Makefile b/Usermode/Applications/ifconfig_src/Makefile index 75e95193..8b6ccff0 100644 --- a/Usermode/Applications/ifconfig_src/Makefile +++ b/Usermode/Applications/ifconfig_src/Makefile @@ -16,7 +16,7 @@ $(BIN): $(COBJ) @echo --- $(LD) -o $@ @$(LD) $(LDFLAGS) -o $@ $(COBJ) -Map Map.txt @objdump -d $(BIN) > $(BIN).dsm - cp $(BIN) $(DISTROOT)/Bin/ + $(xCP) $(BIN) $(DISTROOT)/Bin/ clean: @$(RM) $(COBJ) $(BIN) $(BIN).dsm Map.txt diff --git a/Usermode/Applications/init_src/Makefile b/Usermode/Applications/init_src/Makefile index 9331f6ed..4541f629 100644 --- a/Usermode/Applications/init_src/Makefile +++ b/Usermode/Applications/init_src/Makefile @@ -20,8 +20,8 @@ $(BIN): $(OBJ) Makefile @echo --- ld -o $(BIN) @$(LD) $(LDFLAGS) $(OBJ) -o $(BIN) $(OBJDUMP) -d $(BIN) > $(BIN).dsm - cp $(BIN) $(DISTROOT)/SBin/ + $(xCP) $(BIN) $(DISTROOT)/SBin/ %.o: %.c - @echo --- cc -o $@ + @echo --- $(CC) -o $@ @$(CC) $(CFLAGS) -c $< -o $@ diff --git a/Usermode/Applications/login_src/Makefile b/Usermode/Applications/login_src/Makefile index bd932b98..717a15fd 100644 --- a/Usermode/Applications/login_src/Makefile +++ b/Usermode/Applications/login_src/Makefile @@ -21,7 +21,7 @@ clean: $(BIN): $(OBJ) @echo --- $(LD) -o $@ @$(LD) $(LDFLAGS) $(OBJ) -o $@ - cp $(BIN) $(DISTROOT)/SBin/ + $(xCP) $(BIN) $(DISTROOT)/SBin/ objdump -d $(BIN) > login.dsm %.o: %.c Makefile diff --git a/Usermode/Applications/ls_src/Makefile b/Usermode/Applications/ls_src/Makefile index efd8834c..75656249 100644 --- a/Usermode/Applications/ls_src/Makefile +++ b/Usermode/Applications/ls_src/Makefile @@ -1,27 +1,27 @@ -# Project: cat - --include ../Makefile.cfg - +# Project: cat + +-include ../Makefile.cfg + COBJ = main.o -BIN = ../ls - -CFLAGS += -Wall -fno-builtin -LDFLAGS += - -.PHONY : all clean - -all: $(BIN) - -$(BIN): $(COBJ) - @echo --- $(LD) -o $@ - @$(LD) $(LDFLAGS) -o $@ $(COBJ) -Map Map.txt - objdump -d $(BIN) > $(BIN).dsm - cp $(BIN) $(DISTROOT)/Bin/ - -clean: +BIN = ../ls + +CFLAGS += -Wall -fno-builtin +LDFLAGS += + +.PHONY : all clean + +all: $(BIN) + +$(BIN): $(COBJ) + @echo --- $(LD) -o $@ + @$(LD) $(LDFLAGS) -o $@ $(COBJ) -Map Map.txt + objdump -d $(BIN) > $(BIN).dsm + $(xCP) $(BIN) $(DISTROOT)/Bin/ + +clean: $(RM) $(COBJ) $(BIN) $(BIN).dsm Map.txt - -$(COBJ): %.o: %.c + +$(COBJ): %.o: %.c @echo --- GCC -o $@ @$(CC) $(CFLAGS) -c $? -o $@ - + diff --git a/Usermode/Applications/mount_src/Makefile b/Usermode/Applications/mount_src/Makefile index a5600172..3f5439d4 100644 --- a/Usermode/Applications/mount_src/Makefile +++ b/Usermode/Applications/mount_src/Makefile @@ -1,27 +1,27 @@ -# Project: mount - --include ../Makefile.cfg - +# Project: mount + +-include ../Makefile.cfg + COBJ = main.o -BIN = ../mount - -CFLAGS += -Wall -fno-builtin -fno-stack-protector -LDFLAGS += - -.PHONY : all clean - -all: $(BIN) - -$(BIN): $(COBJ) - @echo --- $(LD) -o $@ - @$(LD) $(LDFLAGS) -o $@ $(COBJ) -Map Map.txt - objdump -d $(BIN) > $(BIN).dsm - cp $(BIN) $(DISTROOT)/Bin/ - -clean: +BIN = ../mount + +CFLAGS += -Wall -fno-builtin -fno-stack-protector +LDFLAGS += + +.PHONY : all clean + +all: $(BIN) + +$(BIN): $(COBJ) + @echo --- $(LD) -o $@ + @$(LD) $(LDFLAGS) -o $@ $(COBJ) -Map Map.txt + objdump -d $(BIN) > $(BIN).dsm + $(xCP) $(BIN) $(DISTROOT)/Bin/ + +clean: $(RM) $(COBJ) $(BIN) Map.txt $(BIN).dsm - -$(COBJ): %.o: %.c + +$(COBJ): %.o: %.c @echo --- GCC -o $@ @$(CC) $(CFLAGS) -c $? -o $@ - + diff --git a/Usermode/Libraries/ld-acess.so_src/Makefile b/Usermode/Libraries/ld-acess.so_src/Makefile index 3298402a..d0b49a44 100644 --- a/Usermode/Libraries/ld-acess.so_src/Makefile +++ b/Usermode/Libraries/ld-acess.so_src/Makefile @@ -25,7 +25,7 @@ $(BIN): $(AOBJ) $(COBJ) @$(LD) $(LDFLAGS) -o $(BIN) $(AOBJ) $(COBJ) > link.txt $(OBJDUMP) -x $(BIN) > ld-acess.dmp $(OBJDUMP) -d $(BIN) > ld-acess.dsm - cp $(BIN) $(DISTROOT)/Libs + $(xCP) $(BIN) $(DISTROOT)/Libs/ $(COBJ): %.o: %.c @echo $(CC) -o $@ diff --git a/Usermode/Libraries/libacess.so_src/Makefile b/Usermode/Libraries/libacess.so_src/Makefile index 0bb0fe4e..5d49668c 100644 --- a/Usermode/Libraries/libacess.so_src/Makefile +++ b/Usermode/Libraries/libacess.so_src/Makefile @@ -21,7 +21,7 @@ $(BIN): $(OBJ) @echo --- $(LD) -shared -o $@ @$(LD) $(LDFLAGS) -o $(BIN) $(OBJ) @$(STRIP) $(BIN) - cp $(BIN) $(DISTROOT)/Libs + $(xCP) $(BIN) $(DISTROOT)/Libs %.ao: %.asm syscalls.inc.asm @echo $(AS) -o $@ diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile index ada30884..bf7b8d15 100644 --- a/Usermode/Libraries/libc.so_src/Makefile +++ b/Usermode/Libraries/libc.so_src/Makefile @@ -27,7 +27,7 @@ $(BIN): $(OBJ) @$(OBJDUMP) -d $@ > libc.so.1.dsm @$(OBJDUMP) -x -r -R $@ > libc.so.1.dmp cp ../libc.so.1 ../libc.so - cp ../libc.so.1 $(DISTROOT)/Libs/ + $(xCP) ../libc.so.1 $(DISTROOT)/Libs/ # C Runtime 0 ../crt0.o: crt0.asm diff --git a/Usermode/Libraries/libgcc.so_src/Makefile b/Usermode/Libraries/libgcc.so_src/Makefile index f29038fe..5308e7de 100644 --- a/Usermode/Libraries/libgcc.so_src/Makefile +++ b/Usermode/Libraries/libgcc.so_src/Makefile @@ -21,7 +21,7 @@ $(BIN): $(OBJS) @echo -- ld -o $@ @$(LD) $(LDFLAGS) -o $(BIN) $(OBJS) @$(OBJDUMP) -d $(BIN) > libgcc.so.dsm - cp $(BIN) $(DISTROOT)/Libs + $(xCP) $(BIN) $(DISTROOT)/Libs $(OBJS): %.o: %.c @echo -- gcc -o $@ -- 2.20.1