Replace direct calls to "make" with $(MAKE)

svn path=/trunk/; revision=4213

diff --git a/reactos/Makefile b/reactos/Makefile
index fda6b0b..7fd18d7 100644 (file)
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -144,19 +144,19 @@ dist: $(TOOLS_PATH)/rcopy$(EXE_POSTFIX) dist_clean dist_dirs \
 # System Applications
 #
 $(SYS_APPS): %:
 # System Applications
 #
 $(SYS_APPS): %:

-       make -C subsys/system/$*
+       $(MAKE) -C subsys/system/$*

 
 $(SYS_APPS:%=%_implib): %_implib:
 
 $(SYS_APPS:%=%_implib): %_implib:

-       make -C subsys/system/$* implib
+       $(MAKE) -C subsys/system/$* implib

 
 $(SYS_APPS:%=%_clean): %_clean:
 
 $(SYS_APPS:%=%_clean): %_clean:

-       make -C subsys/system/$* clean
+       $(MAKE) -C subsys/system/$* clean

 
 $(SYS_APPS:%=%_dist): %_dist:
 
 $(SYS_APPS:%=%_dist): %_dist:

-       make -C subsys/system/$* dist
+       $(MAKE) -C subsys/system/$* dist

 
 $(SYS_APPS:%=%_install): %_install:
 
 $(SYS_APPS:%=%_install): %_install:

-       make -C subsys/system/$* install
+       $(MAKE) -C subsys/system/$* install

 
 .PHONY: $(SYS_APPS) $(SYS_APPS:%=%_implib) $(SYS_APPS:%=%_clean) $(SYS_APPS:%=%_install) $(SYS_APPS:%=%_dist)
 
 
 .PHONY: $(SYS_APPS) $(SYS_APPS:%=%_implib) $(SYS_APPS:%=%_clean) $(SYS_APPS:%=%_install) $(SYS_APPS:%=%_dist)
 


@@ -164,22 +164,22 @@ $(SYS_APPS:%=%_install): %_install:
 # System Services
 #
 $(SYS_SVC): %:
 # System Services
 #
 $(SYS_SVC): %:

-       make -C services/$*
+       $(MAKE) -C services/$*

 
 $(SYS_SVC:%=%_depends): %_depends:
 
 $(SYS_SVC:%=%_depends): %_depends:

-       make -C services/$* depends
+       $(MAKE) -C services/$* depends

 
 $(SYS_SVC:%=%_implib): %_implib:
 
 $(SYS_SVC:%=%_implib): %_implib:

-       make -C services/$* implib
+       $(MAKE) -C services/$* implib

 
 $(SYS_SVC:%=%_clean): %_clean:
 
 $(SYS_SVC:%=%_clean): %_clean:

-       make -C services/$* clean
+       $(MAKE) -C services/$* clean

 
 $(SYS_SVC:%=%_dist): %_dist:
 
 $(SYS_SVC:%=%_dist): %_dist:

-       make -C services/$* dist
+       $(MAKE) -C services/$* dist

 
 $(SYS_SVC:%=%_install): %_install:
 
 $(SYS_SVC:%=%_install): %_install:

-       make -C services/$* install
+       $(MAKE) -C services/$* install

 
 .PHONY: $(SYS_SVC) $(SYS_SVC:%=%_depends) $(SYS_SVC:%=%_implib) $(SYS_SVC:%=%_clean) $(SYS_SVC:%=%_install) $(SYS_SVC:%=%_dist)
 
 
 .PHONY: $(SYS_SVC) $(SYS_SVC:%=%_depends) $(SYS_SVC:%=%_implib) $(SYS_SVC:%=%_clean) $(SYS_SVC:%=%_install) $(SYS_SVC:%=%_dist)
 


@@ -191,19 +191,19 @@ $(SYS_SVC:%=%_install): %_install:
 # Extra (optional system) Applications
 #
 $(APPS): %:
 # Extra (optional system) Applications
 #
 $(APPS): %:

-       make -C apps/$*
+       $(MAKE) -C apps/$*

 
 $(APPS:%=%_implib): %_implib:
 
 $(APPS:%=%_implib): %_implib:

-       make -C apps/$* implib
+       $(MAKE) -C apps/$* implib

 
 $(APPS:%=%_clean): %_clean:
 
 $(APPS:%=%_clean): %_clean:

-       make -C apps/$* clean
+       $(MAKE) -C apps/$* clean

 
 $(APPS:%=%_dist): %_dist:
 
 $(APPS:%=%_dist): %_dist:

-       make -C apps/$* dist
+       $(MAKE) -C apps/$* dist

 
 $(APPS:%=%_install): %_install:
 
 $(APPS:%=%_install): %_install:

-       make -C apps/$* install
+       $(MAKE) -C apps/$* install

 
 .PHONY: $(APPS) $(APPS:%=%_implib) $(APPS:%=%_clean) $(APPS:%=%_install) $(APPS:%=%_dist)
 
 
 .PHONY: $(APPS) $(APPS:%=%_implib) $(APPS:%=%_clean) $(APPS:%=%_install) $(APPS:%=%_dist)
 


@@ -212,22 +212,22 @@ $(APPS:%=%_install): %_install:
 # External ports and subsystem personalities
 #
 $(EXTERNALS): %:
 # External ports and subsystem personalities
 #
 $(EXTERNALS): %:

-       make -C $(ROOT_PATH)/$*
+       $(MAKE) -C $(ROOT_PATH)/$*

 
 $(EXTERNALS:%=%_depends): %_depends:
 
 $(EXTERNALS:%=%_depends): %_depends:

-       make -C $(ROOT_PATH)/$* depends
+       $(MAKE) -C $(ROOT_PATH)/$* depends

 
 $(EXTERNALS:%=%_implib): %_implib:
 
 $(EXTERNALS:%=%_implib): %_implib:

-       make -C $(ROOT_PATH)/$* implib
+       $(MAKE) -C $(ROOT_PATH)/$* implib

 
 $(EXTERNALS:%=%_clean): %_clean:
 
 $(EXTERNALS:%=%_clean): %_clean:

-       make -C $(ROOT_PATH)/$* clean
+       $(MAKE) -C $(ROOT_PATH)/$* clean

 
 $(EXTERNALS:%=%_dist): %_dist:
 
 $(EXTERNALS:%=%_dist): %_dist:

-       make -C $(ROOT_PATH)/$* dist
+       $(MAKE) -C $(ROOT_PATH)/$* dist

 
 $(EXTERNALS:%=%_install): %_install:
 
 $(EXTERNALS:%=%_install): %_install:

-       make -C $(ROOT_PATH)/$* install
+       $(MAKE) -C $(ROOT_PATH)/$* install

 
 .PHONY: $(EXTERNALS) $(EXTERNALS:%=%_depends) $(EXTERNALS:%=%_implib) $(EXTERNALS:%=%_clean) $(EXTERNALS:%=%_install) $(EXTERNALS:%=%_dist)
 
 
 .PHONY: $(EXTERNALS) $(EXTERNALS:%=%_depends) $(EXTERNALS:%=%_implib) $(EXTERNALS:%=%_clean) $(EXTERNALS:%=%_install) $(EXTERNALS:%=%_dist)
 


@@ -236,12 +236,12 @@ $(EXTERNALS:%=%_install): %_install:
 # Tools
 #
 tools:
 # Tools
 #
 tools:

-       make -C tools
+       $(MAKE) -C tools

 
 tools_implib:
 
 tools_clean:
 
 tools_implib:
 
 tools_clean:

-       make -C tools clean
+       $(MAKE) -C tools clean

 
 tools_install:
 
 
 tools_install:
 


@@ -294,24 +294,24 @@ dk_dist:
 # Interfaces
 #
 iface_native:
 # Interfaces
 #
 iface_native:

-       make -C iface/native
+       $(MAKE) -C iface/native

 
 iface_native_implib:
 
 iface_native_clean:
 
 iface_native_implib:
 
 iface_native_clean:

-       make -C iface/native clean
+       $(MAKE) -C iface/native clean

 
 iface_native_install:
 
 iface_native_dist:
 
 iface_additional:
 
 iface_native_install:
 
 iface_native_dist:
 
 iface_additional:

-       make -C iface/addsys
+       $(MAKE) -C iface/addsys

 
 iface_additional_implib:
 
 iface_additional_clean:
 
 iface_additional_implib:
 
 iface_additional_clean:

-       make -C iface/addsys clean
+       $(MAKE) -C iface/addsys clean

 
 iface_additional_install:
 
 
 iface_additional_install:
 


@@ -326,19 +326,19 @@ iface_additional_dist:
 # Bus driver rules
 #
 $(BUS): %:
 # Bus driver rules
 #
 $(BUS): %:

-       make -C drivers/bus/$*
+       $(MAKE) -C drivers/bus/$*

 
 $(BUS:%=%_implib): %_implib:
 
 $(BUS:%=%_implib): %_implib:

-       make -C drivers/bus/$* implib
+       $(MAKE) -C drivers/bus/$* implib

 
 $(BUS:%=%_clean): %_clean:
 
 $(BUS:%=%_clean): %_clean:

-       make -C drivers/bus/$* clean
+       $(MAKE) -C drivers/bus/$* clean

 
 $(BUS:%=%_install): %_install:
 
 $(BUS:%=%_install): %_install:

-       make -C drivers/bus/$* install
+       $(MAKE) -C drivers/bus/$* install

 
 $(BUS:%=%_dist): %_dist:
 
 $(BUS:%=%_dist): %_dist:

-       make -C drivers/bus/$* dist
+       $(MAKE) -C drivers/bus/$* dist

 
 .PHONY: $(BUS) $(BUS:%=%_implib) $(BUS:%=%_clean) \
         $(BUS:%=%_install) $(BUS:%=%_dist)
 
 .PHONY: $(BUS) $(BUS:%=%_implib) $(BUS:%=%_clean) \
         $(BUS:%=%_install) $(BUS:%=%_dist)


@@ -347,19 +347,19 @@ $(BUS:%=%_dist): %_dist:
 # Driver support libraries rules
 #
 $(DRIVERS_LIB): %:
 # Driver support libraries rules
 #
 $(DRIVERS_LIB): %:

-       make -C drivers/lib/$*
+       $(MAKE) -C drivers/lib/$*

 
 $(DRIVERS_LIB:%=%_implib): %_implib:
 
 $(DRIVERS_LIB:%=%_implib): %_implib:

-       make -C drivers/lib/$* implib
+       $(MAKE) -C drivers/lib/$* implib

 
 $(DRIVERS_LIB:%=%_clean): %_clean:
 
 $(DRIVERS_LIB:%=%_clean): %_clean:

-       make -C drivers/lib/$* clean
+       $(MAKE) -C drivers/lib/$* clean

 
 $(DRIVERS_LIB:%=%_install): %_install:
 
 $(DRIVERS_LIB:%=%_install): %_install:

-       make -C drivers/lib/$* install
+       $(MAKE) -C drivers/lib/$* install

 
 $(DRIVERS_LIB:%=%_dist): %_dist:
 
 $(DRIVERS_LIB:%=%_dist): %_dist:

-       make -C drivers/lib/$* dist
+       $(MAKE) -C drivers/lib/$* dist

 
 .PHONY: $(DRIVERS_LIB) $(DRIVERS_LIB:%=%_implib) $(DRIVERS_LIB:%=%_clean) \
         $(DRIVERS_LIB:%=%_install) $(DRIVERS_LIB:%=%_dist)
 
 .PHONY: $(DRIVERS_LIB) $(DRIVERS_LIB:%=%_implib) $(DRIVERS_LIB:%=%_clean) \
         $(DRIVERS_LIB:%=%_install) $(DRIVERS_LIB:%=%_dist)


@@ -368,19 +368,19 @@ $(DRIVERS_LIB:%=%_dist): %_dist:
 # Device driver rules
 #
 $(DEVICE_DRIVERS): %:
 # Device driver rules
 #
 $(DEVICE_DRIVERS): %:

-       make -C drivers/dd/$*
+       $(MAKE) -C drivers/dd/$*

 
 $(DEVICE_DRIVERS:%=%_implib): %_implib:
 
 $(DEVICE_DRIVERS:%=%_implib): %_implib:

-       make -C drivers/dd/$* implib
+       $(MAKE) -C drivers/dd/$* implib

 
 $(DEVICE_DRIVERS:%=%_clean): %_clean:
 
 $(DEVICE_DRIVERS:%=%_clean): %_clean:

-       make -C drivers/dd/$* clean
+       $(MAKE) -C drivers/dd/$* clean

 
 $(DEVICE_DRIVERS:%=%_install): %_install:
 
 $(DEVICE_DRIVERS:%=%_install): %_install:

-       make -C drivers/dd/$* install
+       $(MAKE) -C drivers/dd/$* install

 
 $(DEVICE_DRIVERS:%=%_dist): %_dist:
 
 $(DEVICE_DRIVERS:%=%_dist): %_dist:

-       make -C drivers/dd/$* dist
+       $(MAKE) -C drivers/dd/$* dist

 
 .PHONY: $(DEVICE_DRIVERS) $(DEVICE_DRIVERS:%=%_implib) $(DEVICE_DRIVERS:%=%_clean) \
         $(DEVICE_DRIVERS:%=%_install) $(DEVICE_DRIVERS:%=%_dist)
 
 .PHONY: $(DEVICE_DRIVERS) $(DEVICE_DRIVERS:%=%_implib) $(DEVICE_DRIVERS:%=%_clean) \
         $(DEVICE_DRIVERS:%=%_install) $(DEVICE_DRIVERS:%=%_dist)


@@ -389,37 +389,37 @@ $(DEVICE_DRIVERS:%=%_dist): %_dist:
 # Input driver rules
 #
 $(INPUT_DRIVERS): %:
 # Input driver rules
 #
 $(INPUT_DRIVERS): %:

-       make -C drivers/input/$*
+       $(MAKE) -C drivers/input/$*

 
 $(INPUT_DRIVERS:%=%_implib): %_implib:
 
 $(INPUT_DRIVERS:%=%_implib): %_implib:

-       make -C drivers/input/$* implib
+       $(MAKE) -C drivers/input/$* implib

 
 $(INPUT_DRIVERS:%=%_clean): %_clean:
 
 $(INPUT_DRIVERS:%=%_clean): %_clean:

-       make -C drivers/input/$* clean
+       $(MAKE) -C drivers/input/$* clean

 
 $(INPUT_DRIVERS:%=%_install): %_install:
 
 $(INPUT_DRIVERS:%=%_install): %_install:

-       make -C drivers/input/$* install
+       $(MAKE) -C drivers/input/$* install

 
 $(INPUT_DRIVERS:%=%_dist): %_dist:
 
 $(INPUT_DRIVERS:%=%_dist): %_dist:

-       make -C drivers/input/$* dist
+       $(MAKE) -C drivers/input/$* dist

 
 .PHONY: $(INPUT_DRIVERS) $(INPUT_DRIVERS:%=%_implib) $(INPUT_DRIVERS:%=%_clean)\
         $(INPUT_DRIVERS:%=%_install) $(INPUT_DRIVERS:%=%_dist)
 
 $(FS_DRIVERS): %:
 
 .PHONY: $(INPUT_DRIVERS) $(INPUT_DRIVERS:%=%_implib) $(INPUT_DRIVERS:%=%_clean)\
         $(INPUT_DRIVERS:%=%_install) $(INPUT_DRIVERS:%=%_dist)
 
 $(FS_DRIVERS): %:

-       make -C drivers/fs/$*
+       $(MAKE) -C drivers/fs/$*

 
 $(FS_DRIVERS:%=%_implib): %_implib:
 
 $(FS_DRIVERS:%=%_implib): %_implib:

-       make -C drivers/fs/$* implib
+       $(MAKE) -C drivers/fs/$* implib

 
 $(FS_DRIVERS:%=%_clean): %_clean:
 
 $(FS_DRIVERS:%=%_clean): %_clean:

-       make -C drivers/fs/$* clean
+       $(MAKE) -C drivers/fs/$* clean

 
 $(FS_DRIVERS:%=%_install): %_install:
 
 $(FS_DRIVERS:%=%_install): %_install:

-       make -C drivers/fs/$* install
+       $(MAKE) -C drivers/fs/$* install

 
 $(FS_DRIVERS:%=%_dist): %_dist:
 
 $(FS_DRIVERS:%=%_dist): %_dist:

-       make -C drivers/fs/$* dist
+       $(MAKE) -C drivers/fs/$* dist

 
 .PHONY: $(FS_DRIVERS) $(FS_DRIVERS:%=%_implib) $(FS_DRIVERS:%=%_clean) \
         $(FS_DRIVERS:%=%_install) $(FS_DRIVERS:%=%_dist)
 
 .PHONY: $(FS_DRIVERS) $(FS_DRIVERS:%=%_implib) $(FS_DRIVERS:%=%_clean) \
         $(FS_DRIVERS:%=%_install) $(FS_DRIVERS:%=%_dist)


@@ -428,37 +428,37 @@ $(FS_DRIVERS:%=%_dist): %_dist:
 # Network driver rules
 #
 $(NET_DRIVERS): %:
 # Network driver rules
 #
 $(NET_DRIVERS): %:

-       make -C drivers/net/$*
+       $(MAKE) -C drivers/net/$*

 
 $(NET_DRIVERS:%=%_implib): %_implib:
 
 $(NET_DRIVERS:%=%_implib): %_implib:

-       make -C drivers/net/$* implib
+       $(MAKE) -C drivers/net/$* implib

 
 $(NET_DRIVERS:%=%_clean): %_clean:
 
 $(NET_DRIVERS:%=%_clean): %_clean:

-       make -C drivers/net/$* clean
+       $(MAKE) -C drivers/net/$* clean

 
 $(NET_DRIVERS:%=%_install): %_install:
 
 $(NET_DRIVERS:%=%_install): %_install:

-       make -C drivers/net/$* install
+       $(MAKE) -C drivers/net/$* install

 
 $(NET_DRIVERS:%=%_dist): %_dist:
 
 $(NET_DRIVERS:%=%_dist): %_dist:

-       make -C drivers/net/$* dist
+       $(MAKE) -C drivers/net/$* dist

 
 .PHONY: $(NET_DRIVERS) $(NET_DRIVERS:%=%_implib) $(NET_DRIVERS:%=%_clean) \
         $(NET_DRIVERS:%=%_install) $(NET_DRIVERS:%=%_dist)
 
 $(NET_DEVICE_DRIVERS): %:
 
 .PHONY: $(NET_DRIVERS) $(NET_DRIVERS:%=%_implib) $(NET_DRIVERS:%=%_clean) \
         $(NET_DRIVERS:%=%_install) $(NET_DRIVERS:%=%_dist)
 
 $(NET_DEVICE_DRIVERS): %:

-       make -C drivers/net/dd/$*
+       $(MAKE) -C drivers/net/dd/$*

 
 $(NET_DEVICE_DRIVERS:%=%_implib): %_implib:
 
 $(NET_DEVICE_DRIVERS:%=%_implib): %_implib:

-       make -C drivers/net/dd/$* implib
+       $(MAKE) -C drivers/net/dd/$* implib

 
 $(NET_DEVICE_DRIVERS:%=%_clean): %_clean:
 
 $(NET_DEVICE_DRIVERS:%=%_clean): %_clean:

-       make -C drivers/net/dd/$* clean
+       $(MAKE) -C drivers/net/dd/$* clean

 
 $(NET_DEVICE_DRIVERS:%=%_install): %_install:
 
 $(NET_DEVICE_DRIVERS:%=%_install): %_install:

-       make -C drivers/net/dd/$* install
+       $(MAKE) -C drivers/net/dd/$* install

 
 $(NET_DEVICE_DRIVERS:%=%_dist): %_dist:
 
 $(NET_DEVICE_DRIVERS:%=%_dist): %_dist:

-       make -C drivers/net/dd/$* dist
+       $(MAKE) -C drivers/net/dd/$* dist

 
 .PHONY: $(NET_DEVICE_DRIVERS) $(NET_DEVICE_DRIVERS:%=%_clean) $(NET_DEVICE_DRIVERS:%=%_implib) \
         $(NET_DEVICE_DRIVERS:%=%_install) $(NET_DEVICE_DRIVERS:%=%_dist)
 
 .PHONY: $(NET_DEVICE_DRIVERS) $(NET_DEVICE_DRIVERS:%=%_clean) $(NET_DEVICE_DRIVERS:%=%_implib) \
         $(NET_DEVICE_DRIVERS:%=%_install) $(NET_DEVICE_DRIVERS:%=%_dist)


@@ -467,19 +467,19 @@ $(NET_DEVICE_DRIVERS:%=%_dist): %_dist:
 # storage driver rules
 #
 $(STORAGE_DRIVERS): %:
 # storage driver rules
 #
 $(STORAGE_DRIVERS): %:

-       make -C drivers/storage/$*
+       $(MAKE) -C drivers/storage/$*

 
 $(STORAGE_DRIVERS:%=%_implib): %_implib:
 
 $(STORAGE_DRIVERS:%=%_implib): %_implib:

-       make -C drivers/storage/$* implib
+       $(MAKE) -C drivers/storage/$* implib

 
 $(STORAGE_DRIVERS:%=%_clean): %_clean:
 
 $(STORAGE_DRIVERS:%=%_clean): %_clean:

-       make -C drivers/storage/$* clean
+       $(MAKE) -C drivers/storage/$* clean

 
 $(STORAGE_DRIVERS:%=%_install): %_install:
 
 $(STORAGE_DRIVERS:%=%_install): %_install:

-       make -C drivers/storage/$* install
+       $(MAKE) -C drivers/storage/$* install

 
 $(STORAGE_DRIVERS:%=%_dist): %_dist:
 
 $(STORAGE_DRIVERS:%=%_dist): %_dist:

-       make -C drivers/storage/$* dist
+       $(MAKE) -C drivers/storage/$* dist

 
 .PHONY: $(STORAGE_DRIVERS) $(STORAGE_DRIVERS:%=%_clean) \
         $(STORAGE_DRIVERS:%=%_install) $(STORAGE_DRIVERS:%=%_dist)
 
 .PHONY: $(STORAGE_DRIVERS) $(STORAGE_DRIVERS:%=%_clean) \
         $(STORAGE_DRIVERS:%=%_install) $(STORAGE_DRIVERS:%=%_dist)


@@ -489,18 +489,18 @@ $(STORAGE_DRIVERS:%=%_dist): %_dist:
 #
 
 $(LOADERS): %:
 #
 
 $(LOADERS): %:

-       make -C loaders/$*
+       $(MAKE) -C loaders/$*

 
 $(LOADERS:%=%_implib): %_implib:
 
 $(LOADERS:%=%_clean): %_clean:
 
 $(LOADERS:%=%_implib): %_implib:
 
 $(LOADERS:%=%_clean): %_clean:

-       make -C loaders/$* clean
+       $(MAKE) -C loaders/$* clean

 
 $(LOADERS:%=%_install): %_install:
 
 $(LOADERS:%=%_install): %_install:

-       make -C loaders/$* install
+       $(MAKE) -C loaders/$* install

 
 $(LOADERS:%=%_dist): %_dist:
 
 $(LOADERS:%=%_dist): %_dist:

-       make -C loaders/$* dist
+       $(MAKE) -C loaders/$* dist

 
 .PHONY: $(LOADERS) $(LOADERS:%=%_implib) $(LOADERS:%=%_clean) $(LOADERS:%=%_install) \
         $(LOADERS:%=%_dist)
 
 .PHONY: $(LOADERS) $(LOADERS:%=%_implib) $(LOADERS:%=%_clean) $(LOADERS:%=%_install) \
         $(LOADERS:%=%_dist)


@@ -510,19 +510,19 @@ $(LOADERS:%=%_dist): %_dist:
 #
 
 ntoskrnl:
 #
 
 ntoskrnl:

-       make -C ntoskrnl
+       $(MAKE) -C ntoskrnl

 
 ntoskrnl_implib:
 
 ntoskrnl_implib:

-       make -C ntoskrnl implib
+       $(MAKE) -C ntoskrnl implib

 
 ntoskrnl_clean:
 
 ntoskrnl_clean:

-       make -C ntoskrnl clean
+       $(MAKE) -C ntoskrnl clean

 
 ntoskrnl_install:
 
 ntoskrnl_install:

-       make -C ntoskrnl install
+       $(MAKE) -C ntoskrnl install

 
 ntoskrnl_dist:
 
 ntoskrnl_dist:

-       make -C ntoskrnl dist
+       $(MAKE) -C ntoskrnl dist

 
 .PHONY: ntoskrnl ntoskrnl_implib ntoskrnl_clean ntoskrnl_install ntoskrnl_dist
 
 
 .PHONY: ntoskrnl ntoskrnl_implib ntoskrnl_clean ntoskrnl_install ntoskrnl_dist
 


@@ -531,19 +531,19 @@ ntoskrnl_dist:
 #
 
 hallib:
 #
 
 hallib:

-       make -C hal/hal
+       $(MAKE) -C hal/hal

 
 hallib_implib:
 
 hallib_implib:

-       make -C hal/hal implib
+       $(MAKE) -C hal/hal implib

 
 hallib_clean:
 
 hallib_clean:

-       make -C hal/hal clean
+       $(MAKE) -C hal/hal clean

 
 hallib_install:
 
 hallib_install:

-       make -C hal/hal install
+       $(MAKE) -C hal/hal install

 
 hallib_dist:
 
 hallib_dist:

-       make -C hal/hal dist
+       $(MAKE) -C hal/hal dist

 
 .PHONY: hallib hallib_implib hallib_clean hallib_install hallib_dist
 
 
 .PHONY: hallib hallib_implib hallib_clean hallib_install hallib_dist
 


@@ -552,19 +552,19 @@ hallib_dist:
 #
 
 $(HALS): %:
 #
 
 $(HALS): %:

-       make -C hal/$*
+       $(MAKE) -C hal/$*

 
 $(HALS:%=%_implib): %_implib:
 
 $(HALS:%=%_implib): %_implib:

-       make -C hal/$* implib
+       $(MAKE) -C hal/$* implib

 
 $(HALS:%=%_clean): %_clean:
 
 $(HALS:%=%_clean): %_clean:

-       make -C hal/$* clean
+       $(MAKE) -C hal/$* clean

 
 $(HALS:%=%_install): %_install:
 
 $(HALS:%=%_install): %_install:

-       make -C hal/$* install
+       $(MAKE) -C hal/$* install

 
 $(HALS:%=%_dist): %_dist:
 
 $(HALS:%=%_dist): %_dist:

-       make -C hal/$* dist
+       $(MAKE) -C hal/$* dist

 
 .PHONY: $(HALS) $(HALS:%=%_implib) $(HALS:%=%_clean) $(HALS:%=%_install) $(HALS:%=%_dist)
 
 
 .PHONY: $(HALS) $(HALS:%=%_implib) $(HALS:%=%_clean) $(HALS:%=%_install) $(HALS:%=%_dist)
 


@@ -573,22 +573,22 @@ $(HALS:%=%_dist): %_dist:
 #
 
 $(DLLS): %:
 #
 
 $(DLLS): %:

-       make -C lib/$*
+       $(MAKE) -C lib/$*

 
 $(DLLS:%=%_depends): %_depends:
 
 $(DLLS:%=%_depends): %_depends:

-       make -C lib/$* depends
+       $(MAKE) -C lib/$* depends

 
 $(DLLS:%=%_implib): %_implib:
 
 $(DLLS:%=%_implib): %_implib:

-       make -C lib/$* implib
+       $(MAKE) -C lib/$* implib

 
 $(DLLS:%=%_clean): %_clean:
 
 $(DLLS:%=%_clean): %_clean:

-       make -C lib/$* clean
+       $(MAKE) -C lib/$* clean

 
 $(DLLS:%=%_install): %_install:
 
 $(DLLS:%=%_install): %_install:

-       make -C lib/$* install
+       $(MAKE) -C lib/$* install

 
 $(DLLS:%=%_dist): %_dist:
 
 $(DLLS:%=%_dist): %_dist:

-       make -C lib/$* dist
+       $(MAKE) -C lib/$* dist

 
 .PHONY: $(DLLS) $(DLLS:%=%_depends) $(DLLS:%=%_implib) $(DLLS:%=%_clean) $(DLLS:%=%_install) $(DLLS:%=%_dist)
 
 
 .PHONY: $(DLLS) $(DLLS:%=%_depends) $(DLLS:%=%_implib) $(DLLS:%=%_clean) $(DLLS:%=%_install) $(DLLS:%=%_dist)
 


@@ -597,22 +597,22 @@ $(DLLS:%=%_dist): %_dist:
 #
 
 $(SUBSYS): %:
 #
 
 $(SUBSYS): %:

-       make -C subsys/$*
+       $(MAKE) -C subsys/$*

 
 $(SUBSYS:%=%_depends): %_depends:
 
 $(SUBSYS:%=%_depends): %_depends:

-       make -C subsys/$* depends
+       $(MAKE) -C subsys/$* depends

 
 $(SUBSYS:%=%_implib): %_implib:
 
 $(SUBSYS:%=%_implib): %_implib:

-       make -C subsys/$* implib
+       $(MAKE) -C subsys/$* implib

 
 $(SUBSYS:%=%_clean): %_clean:
 
 $(SUBSYS:%=%_clean): %_clean:

-       make -C subsys/$* clean
+       $(MAKE) -C subsys/$* clean

 
 $(SUBSYS:%=%_install): %_install:
 
 $(SUBSYS:%=%_install): %_install:

-       make -C subsys/$* install
+       $(MAKE) -C subsys/$* install

 
 $(SUBSYS:%=%_dist): %_dist:
 
 $(SUBSYS:%=%_dist): %_dist:

-       make -C subsys/$* dist
+       $(MAKE) -C subsys/$* dist

 
 .PHONY: $(SUBSYS) $(SUBSYS:%=%_depends) $(SUBSYS:%=%_implib) $(SUBSYS:%=%_clean) $(SUBSYS:%=%_install) \
         $(SUBSYS:%=%_dist)
 
 .PHONY: $(SUBSYS) $(SUBSYS:%=%_depends) $(SUBSYS:%=%_implib) $(SUBSYS:%=%_clean) $(SUBSYS:%=%_install) \
         $(SUBSYS:%=%_dist)

diff --git a/reactos/apps/testsets/Makefile b/reactos/apps/testsets/Makefile
index 8aaf049..c8cdd48 100644 (file)
--- a/reactos/apps/testsets/Makefile
+++ b/reactos/apps/testsets/Makefile
@@ -59,19 +59,19 @@ dist:       $(TEST_SETS:%=%_dist) \
 # Testset Applications
 #
 $(TEST_SETS): %:
 # Testset Applications
 #
 $(TEST_SETS): %:

-       make -C $*
+       $(MAKE) -C $*

 
 $(TEST_SETS:%=%_implib): %_implib:
 
 $(TEST_SETS:%=%_implib): %_implib:

-       make -C $* implib
+       $(MAKE) -C $* implib

 
 $(TEST_SETS:%=%_clean): %_clean:
 
 $(TEST_SETS:%=%_clean): %_clean:

-       make -C $* clean
+       $(MAKE) -C $* clean

 
 $(TEST_SETS:%=%_dist): %_dist:
 
 $(TEST_SETS:%=%_dist): %_dist:

-       make -C $* dist
+       $(MAKE) -C $* dist

 
 $(TEST_SETS:%=%_install): %_install:
 
 $(TEST_SETS:%=%_install): %_install:

-       make -C $* install
+       $(MAKE) -C $* install

 
 .PHONY: $(TEST_SETS) $(TEST_SETS:%=%_implib) $(TEST_SETS:%=%_clean) $(TEST_SETS:%=%_install) $(TEST_SETS:%=%_dist)
 
 
 .PHONY: $(TEST_SETS) $(TEST_SETS:%=%_implib) $(TEST_SETS:%=%_clean) $(TEST_SETS:%=%_install) $(TEST_SETS:%=%_dist)
 


@@ -80,19 +80,19 @@ $(TEST_SETS:%=%_install): %_install:
 # Kernel32 Test Applications
 #
 $(TEST_KERNEL32): %:
 # Kernel32 Test Applications
 #
 $(TEST_KERNEL32): %:

-       make -C kernel32/$*
+       $(MAKE) -C kernel32/$*

 
 $(TEST_KERNEL32:%=%_implib): %_implib:
 
 $(TEST_KERNEL32:%=%_implib): %_implib:

-       make -C kernel32/$* implib
+       $(MAKE) -C kernel32/$* implib

 
 $(TEST_KERNEL32:%=%_clean): %_clean:
 
 $(TEST_KERNEL32:%=%_clean): %_clean:

-       make -C kernel32/$* clean
+       $(MAKE) -C kernel32/$* clean

 
 $(TEST_KERNEL32:%=%_dist): %_dist:
 
 $(TEST_KERNEL32:%=%_dist): %_dist:

-       make -C kernel32/$* dist
+       $(MAKE) -C kernel32/$* dist

 
 $(TEST_KERNEL32:%=%_install): %_install:
 
 $(TEST_KERNEL32:%=%_install): %_install:

-       make -C kernel32/$* install
+       $(MAKE) -C kernel32/$* install

 
 .PHONY: $(TEST_KERNEL32) $(TEST_KERNEL32:%=%_implib) $(TEST_KERNEL32:%=%_clean) $(TEST_KERNEL32:%=%_install) $(TEST_KERNEL32:%=%_dist)
 
 
 .PHONY: $(TEST_KERNEL32) $(TEST_KERNEL32:%=%_implib) $(TEST_KERNEL32:%=%_clean) $(TEST_KERNEL32:%=%_install) $(TEST_KERNEL32:%=%_dist)
 


@@ -101,19 +101,19 @@ $(TEST_KERNEL32:%=%_install): %_install:
 # msvcrt Test Applications
 #
 $(TEST_MSVCRT): %:
 # msvcrt Test Applications
 #
 $(TEST_MSVCRT): %:

-       make -C msvcrt/$*
+       $(MAKE) -C msvcrt/$*

 
 $(TEST_MSVCRT:%=%_implib): %_implib:
 
 $(TEST_MSVCRT:%=%_implib): %_implib:

-       make -C msvcrt/$* implib
+       $(MAKE) -C msvcrt/$* implib

 
 $(TEST_MSVCRT:%=%_clean): %_clean:
 
 $(TEST_MSVCRT:%=%_clean): %_clean:

-       make -C msvcrt/$* clean
+       $(MAKE) -C msvcrt/$* clean

 
 $(TEST_MSVCRT:%=%_dist): %_dist:
 
 $(TEST_MSVCRT:%=%_dist): %_dist:

-       make -C msvcrt/$* dist
+       $(MAKE) -C msvcrt/$* dist

 
 $(TEST_MSVCRT:%=%_install): %_install:
 
 $(TEST_MSVCRT:%=%_install): %_install:

-       make -C msvcrt/$* install
+       $(MAKE) -C msvcrt/$* install

 
 .PHONY: $(TEST_MSVCRT) $(TEST_MSVCRT:%=%_implib) $(TEST_MSVCRT:%=%_clean) $(TEST_MSVCRT:%=%_install) $(TEST_MSVCRT:%=%_dist)
 
 
 .PHONY: $(TEST_MSVCRT) $(TEST_MSVCRT:%=%_implib) $(TEST_MSVCRT:%=%_clean) $(TEST_MSVCRT:%=%_install) $(TEST_MSVCRT:%=%_dist)
 


@@ -122,19 +122,19 @@ $(TEST_MSVCRT:%=%_install): %_install:
 # COM Test Applications
 #
 $(TEST_COM): %:
 # COM Test Applications
 #
 $(TEST_COM): %:

-       make -C com/$*
+       $(MAKE) -C com/$*

 
 $(TEST_COM:%=%_implib): %_implib:
 
 $(TEST_COM:%=%_implib): %_implib:

-       make -C com/$* implib
+       $(MAKE) -C com/$* implib

 
 $(TEST_COM:%=%_clean): %_clean:
 
 $(TEST_COM:%=%_clean): %_clean:

-       make -C com/$* clean
+       $(MAKE) -C com/$* clean

 
 $(TEST_COM:%=%_dist): %_dist:
 
 $(TEST_COM:%=%_dist): %_dist:

-       make -C com/$* dist
+       $(MAKE) -C com/$* dist

 
 $(TEST_COM:%=%_install): %_install:
 
 $(TEST_COM:%=%_install): %_install:

-       make -C com/$* install
+       $(MAKE) -C com/$* install

 
 .PHONY: $(TEST_COM) $(TEST_COM:%=%_implib) $(TEST_COM:%=%_clean) $(TEST_COM:%=%_install) $(TEST_COM:%=%_dist)
 
 
 .PHONY: $(TEST_COM) $(TEST_COM:%=%_implib) $(TEST_COM:%=%_clean) $(TEST_COM:%=%_install) $(TEST_COM:%=%_dist)
 


@@ -143,19 +143,19 @@ $(TEST_COM:%=%_install): %_install:
 # SEH Test Applications
 #
 $(TEST_SEH): %:
 # SEH Test Applications
 #
 $(TEST_SEH): %:

-       make -C seh/$*
+       $(MAKE) -C seh/$*

 
 $(TEST_SEH:%=%_implib): %_implib:
 
 $(TEST_SEH:%=%_implib): %_implib:

-       make -C seh/$* implib
+       $(MAKE) -C seh/$* implib

 
 $(TEST_SEH:%=%_clean): %_clean:
 
 $(TEST_SEH:%=%_clean): %_clean:

-       make -C seh/$* clean
+       $(MAKE) -C seh/$* clean

 
 $(TEST_SEH:%=%_dist): %_dist:
 
 $(TEST_SEH:%=%_dist): %_dist:

-       make -C seh/$* dist
+       $(MAKE) -C seh/$* dist

 
 $(TEST_SEH:%=%_install): %_install:
 
 $(TEST_SEH:%=%_install): %_install:

-       make -C seh/$* install
+       $(MAKE) -C seh/$* install

 
 .PHONY: $(TEST_SEH) $(TEST_SEH:%=%_implib) $(TEST_SEH:%=%_clean) $(TEST_SEH:%=%_install) $(TEST_SEH:%=%_dist)
 
 
 .PHONY: $(TEST_SEH) $(TEST_SEH:%=%_implib) $(TEST_SEH:%=%_clean) $(TEST_SEH:%=%_install) $(TEST_SEH:%=%_dist)
 


@@ -164,19 +164,19 @@ $(TEST_SEH:%=%_install): %_install:
 # Regression Test Applications
 #
 $(TEST_REGRESSIONS): %:
 # Regression Test Applications
 #
 $(TEST_REGRESSIONS): %:

-       make -C regres/$*
+       $(MAKE) -C regres/$*

 
 $(TEST_REGRESSIONS:%=%_implib): %_implib:
 
 $(TEST_REGRESSIONS:%=%_implib): %_implib:

-       make -C regres/$* implib
+       $(MAKE) -C regres/$* implib

 
 $(TEST_REGRESSIONS:%=%_clean): %_clean:
 
 $(TEST_REGRESSIONS:%=%_clean): %_clean:

-       make -C regres/$* clean
+       $(MAKE) -C regres/$* clean

 
 $(TEST_REGRESSIONS:%=%_dist): %_dist:
 
 $(TEST_REGRESSIONS:%=%_dist): %_dist:

-       make -C regres/$* dist
+       $(MAKE) -C regres/$* dist

 
 $(TEST_REGRESSIONS:%=%_install): %_install:
 
 $(TEST_REGRESSIONS:%=%_install): %_install:

-       make -C regres/$* install
+       $(MAKE) -C regres/$* install

 
 .PHONY: $(TEST_REGRESSIONS) $(TEST_REGRESSIONS:%=%_implib) $(TEST_REGRESSIONS:%=%_clean) $(TEST_REGRESSIONS:%=%_install) $(TEST_REGRESSIONS:%=%_dist)
 
 
 .PHONY: $(TEST_REGRESSIONS) $(TEST_REGRESSIONS:%=%_implib) $(TEST_REGRESSIONS:%=%_clean) $(TEST_REGRESSIONS:%=%_install) $(TEST_REGRESSIONS:%=%_dist)
 

diff --git a/reactos/apps/utils/Makefile b/reactos/apps/utils/Makefile
index a9b1033..6d83f56 100644 (file)
--- a/reactos/apps/utils/Makefile
+++ b/reactos/apps/utils/Makefile
@@ -37,19 +37,19 @@ dist:       $(UTIL_APPS:%=%_dist) \
 # Utility Applications
 #
 $(UTIL_APPS): %:
 # Utility Applications
 #
 $(UTIL_APPS): %:

-       make -C $*
+       $(MAKE) -C $*

 
 $(UTIL_APPS:%=%_implib): %_implib:
 
 $(UTIL_APPS:%=%_implib): %_implib:

-       make -C $* implib
+       $(MAKE) -C $* implib

 
 $(UTIL_APPS:%=%_clean): %_clean:
 
 $(UTIL_APPS:%=%_clean): %_clean:

-       make -C $* clean
+       $(MAKE) -C $* clean

 
 $(UTIL_APPS:%=%_dist): %_dist:
 
 $(UTIL_APPS:%=%_dist): %_dist:

-       make -C $* dist
+       $(MAKE) -C $* dist

 
 $(UTIL_APPS:%=%_install): %_install:
 
 $(UTIL_APPS:%=%_install): %_install:

-       make -C $* install
+       $(MAKE) -C $* install

 
 .PHONY: $(UTIL_APPS) $(UTIL_APPS:%=%_implib) $(UTIL_APPS:%=%_clean) $(UTIL_APPS:%=%_install) $(UTIL_APPS:%=%_dist)
 
 
 .PHONY: $(UTIL_APPS) $(UTIL_APPS:%=%_implib) $(UTIL_APPS:%=%_clean) $(UTIL_APPS:%=%_install) $(UTIL_APPS:%=%_dist)
 


@@ -58,19 +58,19 @@ $(UTIL_APPS:%=%_install): %_install:
 # GUI Utility Applications
 #
 $(UTIL_NET_APPS): %:
 # GUI Utility Applications
 #
 $(UTIL_NET_APPS): %:

-       make -C net/$*
+       $(MAKE) -C net/$*

 
 $(UTIL_NET_APPS:%=%_implib): %_implib:
 
 $(UTIL_NET_APPS:%=%_implib): %_implib:

-       make -C net/$* implib
+       $(MAKE) -C net/$* implib

 
 $(UTIL_NET_APPS:%=%_clean): %_clean:
 
 $(UTIL_NET_APPS:%=%_clean): %_clean:

-       make -C net/$* clean
+       $(MAKE) -C net/$* clean

 
 $(UTIL_NET_APPS:%=%_dist): %_dist:
 
 $(UTIL_NET_APPS:%=%_dist): %_dist:

-       make -C net/$* dist
+       $(MAKE) -C net/$* dist

 
 $(UTIL_NET_APPS:%=%_install): %_install:
 
 $(UTIL_NET_APPS:%=%_install): %_install:

-       make -C net/$* install
+       $(MAKE) -C net/$* install

 
 .PHONY: $(UTIL_NET_APPS) $(UTIL_NET_APPS:%=%_implib) $(UTIL_NET_APPS:%=%_clean) $(UTIL_NET_APPS:%=%_install) $(UTIL_NET_APPS:%=%_dist)
 
 
 .PHONY: $(UTIL_NET_APPS) $(UTIL_NET_APPS:%=%_implib) $(UTIL_NET_APPS:%=%_clean) $(UTIL_NET_APPS:%=%_install) $(UTIL_NET_APPS:%=%_dist)
 

diff --git a/reactos/apps/utils/cabman/makefile b/reactos/apps/utils/cabman/makefile
index eda0930..cced1b1 100644 (file)
--- a/reactos/apps/utils/cabman/makefile
+++ b/reactos/apps/utils/cabman/makefile
@@ -50,7 +50,7 @@ endif
 
 #FIXME: zlib should be compiled and installed in the SDK by the master makefile
 $(ZLIB_PATH)/zlib.a:
 
 #FIXME: zlib should be compiled and installed in the SDK by the master makefile
 $(ZLIB_PATH)/zlib.a:

-       make -C $(ZLIB_PATH) -f makefile.reactos
+       $(MAKE) -C $(ZLIB_PATH) -f makefile.reactos

 
 $(TARGET).exe: $(OBJECTS) $(ZLIB_PATH)/zlib.a
        $(CC) $(OBJECTS) -lstdc++ -o $(TARGET).exe
 
 $(TARGET).exe: $(OBJECTS) $(ZLIB_PATH)/zlib.a
        $(CC) $(OBJECTS) -lstdc++ -o $(TARGET).exe

diff --git a/reactos/apps/utils/pice/makefile b/reactos/apps/utils/pice/makefile
index 9a6ae1e..8eab788 100644 (file)
--- a/reactos/apps/utils/pice/makefile
+++ b/reactos/apps/utils/pice/makefile
@@ -1,21 +1,21 @@
-# $Id: makefile,v 1.1 2002/02/10 02:01:31 chorns Exp $
+# $Id: makefile,v 1.2 2003/02/28 22:51:16 gvg Exp $

 
 all:
 
 all:

-       make -C loader
-       make -C module
+       $(MAKE) -C loader
+       $(MAKE) -C module

 
 implib:
 
 implib:

-       make -C loader implib
-       make -C module implib
+       $(MAKE) -C loader implib
+       $(MAKE) -C module implib

        
 clean:
        
 clean:

-       make -C loader clean
-       make -C module clean
+       $(MAKE) -C loader clean
+       $(MAKE) -C module clean

 
 dist:
 
 dist:

-       make -C loader dist
-       make -C module dist
+       $(MAKE) -C loader dist
+       $(MAKE) -C module dist

 
 install:
 
 install:

-       make -C loader install
-       make -C module install
+       $(MAKE) -C loader install
+       $(MAKE) -C module install

diff --git a/reactos/drivers/dd/vga/makefile b/reactos/drivers/dd/vga/makefile
index 89190ce..6ac3522 100644 (file)
--- a/reactos/drivers/dd/vga/makefile
+++ b/reactos/drivers/dd/vga/makefile
@@ -1,22 +1,22 @@
-# $Id: makefile,v 1.10 2001/11/03 16:48:07 chorns Exp $
+# $Id: makefile,v 1.11 2003/02/28 22:51:17 gvg Exp $

 #
 #
 all:
 #
 #
 all:

-       make -C display
-       make -C miniport
+       $(MAKE) -C display
+       $(MAKE) -C miniport

 
 implib:
 
 implib:

-       make -C display implib
-       make -C miniport implib
+       $(MAKE) -C display implib
+       $(MAKE) -C miniport implib

        
 clean:
        
 clean:

-       make -C display clean
-       make -C miniport clean
+       $(MAKE) -C display clean
+       $(MAKE) -C miniport clean

 
 dist:
 
 dist:

-       make -C display dist
-       make -C miniport dist
+       $(MAKE) -C display dist
+       $(MAKE) -C miniport dist

 
 install:
 
 install:

-       make -C display install
-       make -C miniport install
+       $(MAKE) -C display install
+       $(MAKE) -C miniport install

diff --git a/reactos/lib/makefile b/reactos/lib/makefile
index 6a32b6c..4f582db 100644 (file)
--- a/reactos/lib/makefile
+++ b/reactos/lib/makefile
@@ -5,10 +5,10 @@ BASE_CFLAGS = -I../include
 all: $(LIBRARIES)
 
 ntdll: dummy
 all: $(LIBRARIES)
 
 ntdll: dummy

-       make -C ntdll
+       $(MAKE) -C ntdll

        
 kernel32: dummy
        
 kernel32: dummy

-       make -C kernel32
+       $(MAKE) -C kernel32

 
 dummy:
 
 
 dummy:
 

diff --git a/reactos/tools/Makefile b/reactos/tools/Makefile
index cee144c..59e83f6 100644 (file)
--- a/reactos/tools/Makefile
+++ b/reactos/tools/Makefile
@@ -71,17 +71,17 @@ endif
 
 
 wmc_directory_target:
 
 
 wmc_directory_target:

-       make -C wmc wmc$(EXE_POSTFIX)
+       $(MAKE) -C wmc wmc$(EXE_POSTFIX)

 
 ifeq ($(HOST),mingw32-linux)
 clean:
 
 ifeq ($(HOST),mingw32-linux)
 clean:

-       make -C wmc clean
+       $(MAKE) -C wmc clean

        rm mkconfig
        rm $(TOOLS)
 endif
 ifeq ($(HOST),mingw32-windows)
 clean:
        rm mkconfig
        rm $(TOOLS)
 endif
 ifeq ($(HOST),mingw32-windows)
 clean:

-       make -C wmc clean
+       $(MAKE) -C wmc clean

        del *$(EXE_POSTFIX)
 endif
 
        del *$(EXE_POSTFIX)
 endif