mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 10:04:49 +00:00
Makefile fixes
svn path=/trunk/; revision=3018
This commit is contained in:
Brian Palmer
parent
aa8aca9ec4
commit
0bb513eddf
5 changed files with 62 additions and 53 deletions
|
|
@ -17,33 +17,34 @@
|
||||||
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
#
|
#
|
||||||
|
|
||||||
export CC = gcc
|
RM = cmd /C del
|
||||||
export LD = ld
|
NASM_CMD = nasm
|
||||||
export AR = ar
|
BIN2C = ../tools/bin2c
|
||||||
export RM = cmd /C del
|
TOOLSDIR = ../tools
|
||||||
export CP = cmd /C copy
|
|
||||||
export NASM_CMD = nasm
|
|
||||||
|
|
||||||
.PHONY : clean
|
.PHONY : clean
|
||||||
|
|
||||||
all: fat.bin fat32.bin isoboot.bin bin2c.exe
|
all: $(BIN2C) fat.bin fat32.bin isoboot.bin
|
||||||
|
|
||||||
fat.bin: fat.asm bin2c.exe
|
$(BIN2C) :
|
||||||
$(NASM_CMD) -o fat.bin -f bin fat.asm
|
@$(MAKE) --no-print-directory -C $(TOOLSDIR)
|
||||||
bin2c fat.bin fat.h fat_data
|
|
||||||
|
fat.bin : fat.asm $(BIN2C)
|
||||||
|
@echo ===================================================== Assembling fat
|
||||||
|
@$(NASM_CMD) -o fat.bin -f bin fat.asm
|
||||||
|
@$(BIN2C) fat.bin fat.h fat_data
|
||||||
|
|
||||||
|
|
||||||
fat32.bin: fat32.asm bin2c.exe
|
fat32.bin : fat32.asm $(BIN2C)
|
||||||
$(NASM_CMD) -o fat32.bin -f bin fat32.asm
|
@echo ===================================================== Assembling fat32
|
||||||
bin2c fat32.bin fat32.h fat32_data
|
@$(NASM_CMD) -o fat32.bin -f bin fat32.asm
|
||||||
|
@$(BIN2C) fat32.bin fat32.h fat32_data
|
||||||
|
|
||||||
isoboot.bin: isoboot.asm
|
isoboot.bin : isoboot.asm
|
||||||
$(NASM_CMD) -o isoboot.bin -f bin isoboot.asm
|
@echo ===================================================== Assembling isoboot
|
||||||
|
@$(NASM_CMD) -o isoboot.bin -f bin isoboot.asm
|
||||||
bin2c.exe: bin2c.c
|
|
||||||
$(CC) -o bin2c.exe bin2c.c
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
- $(RM) *.bin
|
@-$(RM) *.bin
|
||||||
- $(RM) *.exe
|
@-$(RM) *.h
|
||||||
- $(RM) *.h
|
@echo Clean ALL done.
|
||||||
|
|
|
||||||
|
|
@ -41,10 +41,10 @@ RM = cmd /C del
|
||||||
CP = cmd /C copy
|
CP = cmd /C copy
|
||||||
MKDIR = cmd /C md
|
MKDIR = cmd /C md
|
||||||
RMDIR = cmd /C rd
|
RMDIR = cmd /C rd
|
||||||
MAKE = make
|
|
||||||
NASM_CMD = nasm
|
NASM_CMD = nasm
|
||||||
OBJCOPY = objcopy
|
OBJCOPY = objcopy
|
||||||
DEPTOOL = $(SRCDIR)/../tools/deptool
|
DEPTOOL = $(SRCDIR)/../tools/deptool
|
||||||
|
TOOLSDIR = $(SRCDIR)/../tools
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------------------------------
|
||||||
# TEST IF WE ARE IN THE TARGET DIRECTORY
|
# TEST IF WE ARE IN THE TARGET DIRECTORY
|
||||||
|
|
@ -240,9 +240,8 @@ all : $(DEPTOOL) freeldr.sys
|
||||||
|
|
||||||
#############################################
|
#############################################
|
||||||
|
|
||||||
$(DEPTOOL): $(DEPTOOL).c
|
$(DEPTOOL) :
|
||||||
@echo ===================================================== Compiling deptool
|
@$(MAKE) --no-print-directory -C $(TOOLSDIR)
|
||||||
@$(CC) -Wall -O3 -o $@ $<
|
|
||||||
|
|
||||||
#############################################
|
#############################################
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,13 +18,9 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
export CC = gcc
|
CC = gcc
|
||||||
export LD = ld
|
LD = ld
|
||||||
export AR = ar
|
RM = cmd /C del
|
||||||
export RM = cmd /C del
|
|
||||||
export CP = cmd /C copy
|
|
||||||
export NASM = nasm
|
|
||||||
export MAKE = make
|
|
||||||
|
|
||||||
FLAGS = -Wall
|
FLAGS = -Wall
|
||||||
|
|
||||||
|
|
@ -34,16 +30,24 @@ LIBS = -lkernel32
|
||||||
|
|
||||||
.PHONY : clean
|
.PHONY : clean
|
||||||
|
|
||||||
all: install.exe
|
all: ../bootsect/fat.h ../bootsect/fat32.h install.exe
|
||||||
|
|
||||||
|
../bootsect/fat.h ../bootsect/fat32.h :
|
||||||
|
@$(MAKE) --no-print-directory -C ../bootsect
|
||||||
|
|
||||||
install.exe: $(OBJS)
|
install.exe: $(OBJS)
|
||||||
|
@echo ===================================================== LINKING install
|
||||||
$(CC) $(FLAGS) -o install.exe $(OBJS)
|
$(CC) $(FLAGS) -o install.exe $(OBJS)
|
||||||
|
|
||||||
install.o: install.c install.h volume.h
|
install.o: install.c install.h volume.h
|
||||||
|
@echo ===================================================== Compiling $*
|
||||||
$(CC) $(FLAGS) -o install.o -c install.c
|
$(CC) $(FLAGS) -o install.o -c install.c
|
||||||
|
|
||||||
volume.o: volume.c volume.h install.h
|
volume.o: volume.c volume.h install.h
|
||||||
|
@echo ===================================================== Compiling $*
|
||||||
$(CC) $(FLAGS) -o volume.o -c volume.c
|
$(CC) $(FLAGS) -o volume.o -c volume.c
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
@-$(RM) *.o
|
||||||
|
@-$(RM) *.exe
|
||||||
|
@echo Clean ALL done.
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#
|
#
|
||||||
# FreeLoader
|
# FreeLoader
|
||||||
# Copyright (C) 1999, 2000, 2001 Brian Palmer <brianp@sginet.com>
|
# Copyright (C) 1998-2002 Brian Palmer <brianp@sginet.com>
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
|
@ -18,27 +18,32 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
export CC = gcc
|
#############################################
|
||||||
export LD = ld
|
# PROGRAMS
|
||||||
export AR = ar
|
#
|
||||||
export RM = cmd /C del
|
CC = gcc
|
||||||
export CP = cmd /C copy
|
RM = cmd /C del
|
||||||
export NASM_CMD = nasm
|
|
||||||
export MAKE = make
|
|
||||||
|
|
||||||
.PHONY : bootsect freeldr install clean
|
#############################################
|
||||||
|
|
||||||
all: bootsect freeldr install
|
TOOLS = deptool \
|
||||||
|
bin2c
|
||||||
|
|
||||||
bootsect:
|
#############################################
|
||||||
$(MAKE) -C bootsect
|
|
||||||
|
|
||||||
freeldr: bootsect
|
all : $(TOOLS)
|
||||||
$(MAKE) -C freeldr
|
|
||||||
|
|
||||||
install:
|
#############################################
|
||||||
$(MAKE) -C install
|
|
||||||
|
|
||||||
|
%: %.c
|
||||||
|
@echo ===================================================== Compiling $*
|
||||||
|
@$(CC) -Wall -O3 -o $@ $<
|
||||||
|
|
||||||
|
#############################################
|
||||||
|
|
||||||
|
|
||||||
|
.PHONY : clean
|
||||||
clean:
|
clean:
|
||||||
$(RM) *.bin
|
@-$(RM) $(TOOLS)
|
||||||
$(MAKE) -C freeldr clean
|
@-$(RM) *.exe
|
||||||
|
@echo Clean ALL done.
|
||||||
Loading…
Reference in a new issue