reactos
diff -u -r1.96 -r1.97
--- rules.mak 16 Aug 2004 22:31:04 -0000 1.96
+++ rules.mak 20 Aug 2004 07:02:09 -0000 1.97
@@ -1,8 +1,3 @@
-#
-# Important
-#
-.EXPORT_ALL_VARIABLES:
-
# Default to verbose mode
ifeq ($(VERBOSE),no)
Q = @
@@ -10,34 +5,34 @@
Q =
endif
-MAKE := @$(MAKE)
+export MAKE := @$(MAKE)
ifeq ($(VERBOSE),no)
# Do not print "Entering directory ..."
-MAKEFLAGS += --no-print-directory
+export MAKEFLAGS += --no-print-directory
# Be silent
-MAKEFLAGS += --silent
+export MAKEFLAGS += --silent
endif
# Windows is default host environment
ifeq ($(HOST),)
-HOST = mingw32-windows
+export HOST = mingw32-windows
endif
# Default to building map files which includes source and asm code
ifeq ($(FULL_MAP),)
-FULL_MAP = yes
+export FULL_MAP = yes
endif
# Default to minimal dependencies, making components not
# depend on all import libraries
ifeq ($(MINIMALDEPENDENCIES),)
-MINIMALDEPENDENCIES = yes
+export MINIMALDEPENDENCIES = yes
endif
# Default to no PCH support
ifeq ($(ROS_USE_PCH),)
-ROS_USE_PCH = no
+export ROS_USE_PCH = no
endif
# uncomment if you use bochs and it displays only 30 rows
@@ -47,135 +42,135 @@
# Choose various options
#
ifeq ($(HOST),mingw32-linux)
-NASM_FORMAT = win32
-PREFIX = mingw32-
-EXE_POSTFIX :=
-EXE_PREFIX := ./
-DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as
+export NASM_FORMAT = win32
+export PREFIX = mingw32-
+export EXE_POSTFIX :=
+export EXE_PREFIX := ./
+export DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as
#
# Do not change NASM_CMD to NASM because older versions of
# nasm doesn't like an environment variable NASM
#
-NASM_CMD = nasm
-DOSCLI =
-FLOPPY_DIR = /mnt/floppy
-SEP := /
-PIPE :=
+export NASM_CMD = nasm
+export DOSCLI =
+export FLOPPY_DIR = /mnt/floppy
+export SEP := /
+export PIPE :=
endif
ifeq ($(HOST),mingw32-windows)
-NASM_FORMAT = win32
-PREFIX =
-EXE_PREFIX :=
-EXE_POSTFIX := .exe
-DLLTOOL = $(Q)$(PREFIX)dlltool --as=$(PREFIX)as
+export NASM_FORMAT = win32
+export PREFIX =
+export EXE_PREFIX :=
+export EXE_POSTFIX := .exe
+export DLLTOOL = $(Q)$(PREFIX)dlltool --as=$(PREFIX)as
#
# Do not change NASM_CMD to NASM because older versions of
# nasm doesn't like an environment variable NASM
#
-NASM_CMD = $(Q)nasmw
-DOSCLI = yes
-FLOPPY_DIR = A:
-SEP := \$(EMPTY_VAR)
-PIPE := -pipe
+export NASM_CMD = $(Q)nasmw
+export DOSCLI = yes
+export FLOPPY_DIR = A:
+export SEP := \$(EMPTY_VAR)
+export PIPE := -pipe
endif
# TOPDIR is used by make bootcd but not defined anywhere. Usurp pointed out
# that it has the same meaning as PATH_TO_TOP.
-TOPDIR = $(PATH_TO_TOP)
+export TOPDIR = $(PATH_TO_TOP)
# Directory to build a bootable CD image in
-BOOTCD_DIR=$(TOPDIR)/../bootcd/disk
-LIVECD_DIR=$(TOPDIR)/../livecd/disk
+export BOOTCD_DIR=$(TOPDIR)/../bootcd/disk
+export LIVECD_DIR=$(TOPDIR)/../livecd/disk
ifeq ($(LIVECD_INSTALL),yes)
-INSTALL_DIR=$(LIVECD_DIR)/reactos
+export INSTALL_DIR=$(LIVECD_DIR)/reactos
else
# Use environment var ROS_INSTALL to override default install dir
ifeq ($(ROS_INSTALL),)
ifeq ($(HOST),mingw32-windows)
-INSTALL_DIR = C:/reactos
+export INSTALL_DIR = C:/reactos
else
-INSTALL_DIR = $(PATH_TO_TOP)/reactos
+export INSTALL_DIR = $(PATH_TO_TOP)/reactos
endif
else
-INSTALL_DIR = $(ROS_INSTALL)
+export INSTALL_DIR = $(ROS_INSTALL)
endif
endif
-CC = $(Q)$(PREFIX)gcc
-CXX = $(Q)$(PREFIX)g++
-HOST_CC = $(Q)gcc
-HOST_CXX = $(Q)g++
-HOST_AR = $(Q)ar
-HOST_NM = $(Q)nm
-LD = $(Q)$(PREFIX)ld
-NM = $(Q)$(PREFIX)nm
-OBJCOPY = $(Q)$(PREFIX)objcopy
-STRIP = $(Q)$(PREFIX)strip
-AS = $(Q)$(PREFIX)gcc -c -x assembler-with-cpp
-CPP = $(Q)$(PREFIX)cpp
-AR = $(Q)$(PREFIX)ar
-RC = $(Q)$(PREFIX)windres
-WRC = $(Q)$(WINE_TOP)/tools/wrc/wrc
-OBJCOPY = $(Q)$(PREFIX)objcopy
-OBJDUMP =$(Q)$(PREFIX)objdump
-TOOLS_PATH = $(PATH_TO_TOP)/tools
-W32API_PATH = $(PATH_TO_TOP)/w32api
-CP = $(Q)$(TOOLS_PATH)/rcopy
-RM = $(Q)$(TOOLS_PATH)/rdel
-RLINE = $(Q)$(TOOLS_PATH)/rline
-RMDIR = $(Q)$(TOOLS_PATH)/rrmdir
-RMKDIR = $(Q)$(TOOLS_PATH)/rmkdir
-RSYM = $(Q)$(TOOLS_PATH)/rsym
-RTOUCH = $(Q)$(TOOLS_PATH)/rtouch
-REGTESTS = $(Q)$(TOOLS_PATH)/regtests
-MC = $(Q)$(TOOLS_PATH)/wmc/wmc
-CABMAN = $(Q)$(TOOLS_PATH)/cabman/cabman
-WINEBUILD = $(Q)$(TOOLS_PATH)/winebuild/winebuild
-WINE2ROS = $(Q)$(TOOLS_PATH)/wine2ros/wine2ros
-MKHIVE = $(Q)$(TOOLS_PATH)/mkhive/mkhive
-CDMAKE = $(Q)$(TOOLS_PATH)/cdmake/cdmake
-BIN2RES = $(Q)$(TOOLS_PATH)/bin2res/bin2res
-XSLTPROC = $(Q)xsltproc
-
-STD_CFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -pipe -march=i386 -D_M_IX86
-STD_CPPFLAGS = $(STD_CFLAGS)
-STD_ASFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -D__ASM__ -D_M_IX86
-STD_RCFLAGS = --include-dir $(PATH_TO_TOP)/include --include-dir $(W32API_PATH)/include
-STD_NFLAGS = -f win32
+export CC = $(Q)$(PREFIX)gcc
+export CXX = $(Q)$(PREFIX)g++
+export HOST_CC = $(Q)gcc
+export HOST_CXX = $(Q)g++
+export HOST_AR = $(Q)ar
+export HOST_NM = $(Q)nm
+export LD = $(Q)$(PREFIX)ld
+export NM = $(Q)$(PREFIX)nm
+export OBJCOPY = $(Q)$(PREFIX)objcopy
+export STRIP = $(Q)$(PREFIX)strip
+export AS = $(Q)$(PREFIX)gcc -c -x assembler-with-cpp
+export CPP = $(Q)$(PREFIX)cpp
+export AR = $(Q)$(PREFIX)ar
+export RC = $(Q)$(PREFIX)windres
+export WRC = $(Q)$(WINE_TOP)/tools/wrc/wrc
+export OBJCOPY = $(Q)$(PREFIX)objcopy
+export OBJDUMP =$(Q)$(PREFIX)objdump
+export TOOLS_PATH = $(PATH_TO_TOP)/tools
+export W32API_PATH = $(PATH_TO_TOP)/w32api
+export CP = $(Q)$(TOOLS_PATH)/rcopy
+export RM = $(Q)$(TOOLS_PATH)/rdel
+export RLINE = $(Q)$(TOOLS_PATH)/rline
+export RMDIR = $(Q)$(TOOLS_PATH)/rrmdir
+export RMKDIR = $(Q)$(TOOLS_PATH)/rmkdir
+export RSYM = $(Q)$(TOOLS_PATH)/rsym
+export RTOUCH = $(Q)$(TOOLS_PATH)/rtouch
+export REGTESTS = $(Q)$(TOOLS_PATH)/regtests
+export MC = $(Q)$(TOOLS_PATH)/wmc/wmc
+export CABMAN = $(Q)$(TOOLS_PATH)/cabman/cabman
+export WINEBUILD = $(Q)$(TOOLS_PATH)/winebuild/winebuild
+export WINE2ROS = $(Q)$(TOOLS_PATH)/wine2ros/wine2ros
+export MKHIVE = $(Q)$(TOOLS_PATH)/mkhive/mkhive
+export CDMAKE = $(Q)$(TOOLS_PATH)/cdmake/cdmake
+export BIN2RES = $(Q)$(TOOLS_PATH)/bin2res/bin2res
+export XSLTPROC = $(Q)xsltproc
+
+export STD_CFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -pipe -march=i386 -D_M_IX86
+export STD_CPPFLAGS = $(STD_CFLAGS)
+export STD_ASFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -D__ASM__ -D_M_IX86
+export STD_RCFLAGS = --include-dir $(PATH_TO_TOP)/include --include-dir $(W32API_PATH)/include
+export STD_NFLAGS = -f win32
# Developer Kits
-DK_PATH=$(PATH_TO_TOP)/dk
+export DK_PATH=$(PATH_TO_TOP)/dk
# Native and kernel mode
-DDK_PATH=$(DK_PATH)/nkm
-DDK_PATH_LIB=$(DDK_PATH)/lib
-DDK_PATH_INC=$(PATH_TO_TOP)/include
+export DDK_PATH=$(DK_PATH)/nkm
+export DDK_PATH_LIB=$(DDK_PATH)/lib
+export DDK_PATH_INC=$(PATH_TO_TOP)/include
# Win32
-SDK_PATH=$(DK_PATH)/w32
-SDK_PATH_LIB=$(SDK_PATH)/lib
-SDK_PATH_INC=$(PATH_TO_TOP)/include
+export SDK_PATH=$(DK_PATH)/w32
+export SDK_PATH_LIB=$(SDK_PATH)/lib
+export SDK_PATH_INC=$(PATH_TO_TOP)/include
# POSIX+
-XDK_PATH=$(DK_PATH)/psx
-XDK_PATH_LIB=$(XDK_PATH)/lib
-XDK_PATH_INC=$(XDK_PATH)/include
+export XDK_PATH=$(DK_PATH)/psx
+export XDK_PATH_LIB=$(XDK_PATH)/lib
+export XDK_PATH_INC=$(XDK_PATH)/include
# Wine Integration
-WINE_PATH=$(PATH_TO_TOP)/../wine
-WINE_PATH_LIB=$(WINE_PATH)/lib
-WINE_PATH_INC=$(WINE_PATH)/include
+export WINE_PATH=$(PATH_TO_TOP)/../wine
+export WINE_PATH_LIB=$(WINE_PATH)/lib
+export WINE_PATH_INC=$(WINE_PATH)/include
# Posix+ Integration
-POSIX_PATH=$(PATH_TO_TOP)/../posix
-POSIX_PATH_LIB=$(POSIX_PATH)/lib
-POSIX_PATH_INC=$(POSIX_PATH)/include
+export POSIX_PATH=$(PATH_TO_TOP)/../posix
+export POSIX_PATH_LIB=$(POSIX_PATH)/lib
+export POSIX_PATH_INC=$(POSIX_PATH)/include
# OS/2 Integration
-OS2_PATH=$(PATH_TO_TOP)/../os2
-OS2_PATH_LIB=$(OS2_PATH)/lib
-OS2_PATH_INC=$(OS2_PATH)/include
+export OS2_PATH=$(PATH_TO_TOP)/../os2
+export OS2_PATH_LIB=$(OS2_PATH)/lib
+export OS2_PATH_INC=$(OS2_PATH)/include
# Other systems integration
-ROOT_PATH=$(PATH_TO_TOP)/..
-REGTESTS_PATH_INC=$(PATH_TO_TOP)/regtests/shared
+export ROOT_PATH=$(PATH_TO_TOP)/..
+export REGTESTS_PATH_INC=$(PATH_TO_TOP)/regtests/shared