From 56481cd659328c9cf5f6618d4015984a6569c278 Mon Sep 17 00:00:00 2001 From: Steven Edwards Date: Tue, 1 Jun 2004 01:21:07 +0000 Subject: [PATCH] Make the freeldr build system more like the reactos module build system. (top level rules.mak, etc....) Travis Snoozy svn path=/trunk/; revision=9579 --- freeldr/Makefile | 20 +---------------- freeldr/bootsect/Makefile | 24 -------------------- freeldr/fdebug/Makefile | 27 ---------------------- freeldr/freeldr/Makefile | 28 ----------------------- freeldr/install/Makefile | 19 ---------------- freeldr/rules.mak | 47 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 48 insertions(+), 117 deletions(-) create mode 100644 freeldr/rules.mak diff --git a/freeldr/Makefile b/freeldr/Makefile index ec556f467cd..fe140b2414a 100644 --- a/freeldr/Makefile +++ b/freeldr/Makefile @@ -22,25 +22,7 @@ ifeq ($(HOST),) HOST = mingw32-windows endif -# -# Choose various options -# -ifeq ($(HOST),mingw32-linux) -RM = rm -f -CP = cp -f -MKDIR = mkdir -SEP = / -else -RM = cmd /C del -CP = copy /Y -MKDIR = md -SEP = \$(EMPTY_VAR) -endif - -NASM_CMD = nasm -NFLAGS = -fwin32 -dwin32 -BIN2C = ..$(SEP)tools$(SEP)bin2c -TOOLSDIR = ..$(SEP)tools +include rules.mak all: $(MAKE) -C tools diff --git a/freeldr/bootsect/Makefile b/freeldr/bootsect/Makefile index 01637637273..4c0a10b843d 100644 --- a/freeldr/bootsect/Makefile +++ b/freeldr/bootsect/Makefile @@ -17,30 +17,6 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -# Windows is default host environment -ifeq ($(HOST),) -HOST = mingw32-windows -endif - -# -# Choose various options -# -ifeq ($(HOST),mingw32-linux) -RM = rm -f -CP = cp -f -MKDIR = mkdir -SEP = / -else -RM = cmd /C del -CP = copy /Y -MKDIR = md -SEP = \$(EMPTY_VAR) -endif - -NASM_CMD = nasm -NFLAGS = -fwin32 -dwin32 -BIN2C = ..$(SEP)tools$(SEP)bin2c -TOOLSDIR = ..$(SEP)tools BOOTCD_DIR = ..$(SEP)..$(SEP)bootcd .PHONY : clean bootcd diff --git a/freeldr/fdebug/Makefile b/freeldr/fdebug/Makefile index efcdfc4e1d2..73ee4387559 100644 --- a/freeldr/fdebug/Makefile +++ b/freeldr/fdebug/Makefile @@ -18,33 +18,6 @@ # -# Windows is default host environment -ifeq ($(HOST),) -HOST = mingw32-windows -endif - -# -# Choose various options -# -ifeq ($(HOST),mingw32-linux) -RM = rm -f -CP = cp -f -MKDIR = mkdir -SEP = / -CC = mingw32-gcc -LD = mingw32-ld -WINDRES = mingw32-windres -else -RM = cmd /C del -CP = copy /Y -MKDIR = md -SEP = \$(EMPTY_VAR) -CC = gcc -LD = ld -RM = cmd /C del -WINDRES = windres -endif - FLAGS = -Wall OBJS = rs232.o fdebug.o fdebug.res diff --git a/freeldr/freeldr/Makefile b/freeldr/freeldr/Makefile index f491077819e..5a619e9dc7b 100644 --- a/freeldr/freeldr/Makefile +++ b/freeldr/freeldr/Makefile @@ -17,34 +17,6 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -# Windows is default host environment -ifeq ($(HOST),) -HOST = mingw32-windows -endif - -# -# Choose various options -# -ifeq ($(HOST),mingw32-linux) -RM = rm -f -CP = cp -f -CC = mingw32-gcc -LD = mingw32-ld -AR = mingw32-ar -NM = mingw32-nm -MKDIR = mkdir -SEP = / -else -RM = cmd /C del -CP = copy /Y -CC = gcc -LD = ld -AR = ar -NM = nm -MKDIR = md -SEP = / -endif - ############################################# # CHANGE THESE FOR YOUR OUTPUT # diff --git a/freeldr/install/Makefile b/freeldr/install/Makefile index 927dd85f30b..70231683ed8 100644 --- a/freeldr/install/Makefile +++ b/freeldr/install/Makefile @@ -17,25 +17,6 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -# Windows is default host environment -ifeq ($(HOST),) -HOST = mingw32-windows -endif - -# -# Choose various options -# -ifeq ($(HOST),mingw32-linux) -RM = rm -f -SEP = / -else -RM = cmd /C del -SEP = \$(EMPTY_VAR) -endif - -CC = mingw32-gcc -LD = mingw32-ld - FLAGS = -Wall OBJS = install.o volume.o diff --git a/freeldr/rules.mak b/freeldr/rules.mak new file mode 100644 index 00000000000..1ff8e0ea6f7 --- /dev/null +++ b/freeldr/rules.mak @@ -0,0 +1,47 @@ +.EXPORT_ALL_VARIABLES: + +# +# Choose various options +# +ifeq ($(HOST),mingw32-linux) +NASM_FORMAT = win32 +PREFIX = mingw32- +EXE_POSTFIX := +EXE_PREFIX := ./ +DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as +NASM_CMD = nasm +DOSCLI = +FLOPPY_DIR = /mnt/floppy +SEP := / +PIPE := +RM = rm -f +CP = cp -f +MKDIR = mkdir +endif + +ifeq ($(HOST),mingw32-windows) +NASM_FORMAT = win32 +PREFIX = +EXE_PREFIX := +EXE_POSTFIX := .exe +DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as +NASM_CMD = nasmw +DOSCLI = yes +FLOPPY_DIR = A: +SEP := \$(EMPTY_VAR) +PIPE := -pipe +RM = cmd /C del +CP = copy /Y +MKDIR = md +endif + + +NFLAGS = -fwin32 -dwin32 +BIN2C = ..$(SEP)tools$(SEP)bin2c +TOOLSDIR = ..$(SEP)tools + +CC = $(PREFIX)gcc +LD = $(PREFIX)ld +AR = $(PREFIX)ar +NM = $(PREFIX)nm +WINDRES = $(PREFIX)windres