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

[reactos.git] / reactos / tools / Makefile

diff --git a/reactos/tools/Makefile b/reactos/tools/Makefile
index f026f90..59e83f6 100644 (file)
--- a/reactos/tools/Makefile
+++ b/reactos/tools/Makefile
@@ -6,11 +6,13 @@ TOOLS = \
   rcopy$(EXE_POSTFIX) \
   rdel$(EXE_POSTFIX) \
   rmkdir$(EXE_POSTFIX) \
-  rrmdir$(EXE_POSTFIX)
+  rrmdir$(EXE_POSTFIX) \
+  rsym$(EXE_POSTFIX) \
+  rtouch$(EXE_POSTFIX)
 
 CLEAN_FILES = $(TOOLS)
 
-all: $(TOOLS)
+all: $(TOOLS) wmc_directory_target
 
 buildno$(EXE_POSTFIX): buildno.c ../include/reactos/version.h
        $(HOST_CC) $(CFLAGS) -o buildno$(EXE_POSTFIX) buildno.c
@@ -29,7 +31,7 @@ rcopy$(EXE_POSTFIX): rcopy.c
 endif
 
 rdel$(EXE_POSTFIX): rdel.c
-       $(HOST_CC) $(CFLAGS) -liberty rdel.c -o rdel$(EXE_POSTFIX)
+       $(HOST_CC) $(CFLAGS) rdel.c -o rdel$(EXE_POSTFIX)
 
 ifeq ($(HOST),mingw32-linux)
 rmkdir$(EXE_POSTFIX): rmkdir.c
@@ -49,15 +51,38 @@ rrmdir$(EXE_POSTFIX): rrmdir.c
        $(HOST_CC) $(CFLAGS) -DDOS_PATHS rrmdir.c -o rrmdir$(EXE_POSTFIX)
 endif
 
+ifeq ($(HOST),mingw32-linux)
+rsym$(EXE_POSTFIX): rsym.c
+       $(HOST_CC) $(CFLAGS) -DUNIX_PATHS rsym.c -o rsym$(EXE_POSTFIX)
+endif
+ifeq ($(HOST),mingw32-windows)
+rsym$(EXE_POSTFIX): rsym.c
+       $(HOST_CC) $(CFLAGS) -DDOS_PATHS rsym.c -o rsym$(EXE_POSTFIX)
+endif
+
+ifeq ($(HOST),mingw32-linux)
+rtouch$(EXE_POSTFIX): rtouch.c
+       $(HOST_CC) $(CFLAGS) -DUNIX_PATHS rtouch.c -o rtouch$(EXE_POSTFIX)
+endif
+ifeq ($(HOST),mingw32-windows)
+rtouch$(EXE_POSTFIX): rtouch.c
+       $(HOST_CC) $(CFLAGS) -DDOS_PATHS rtouch.c -o rtouch$(EXE_POSTFIX)
+endif
+
+
+wmc_directory_target:
+       $(MAKE) -C wmc wmc$(EXE_POSTFIX)
+
 ifeq ($(HOST),mingw32-linux)
 clean:
+       $(MAKE) -C wmc clean
+       rm mkconfig
        rm $(TOOLS)
-       rm mkconfig$(EXE_POSTFIX)
 endif
 ifeq ($(HOST),mingw32-windows)
 clean:
-       del $(TOOLS)
-       del mkconfig$(EXE_POSTFIX)
+       $(MAKE) -C wmc clean
+       del *$(EXE_POSTFIX)
 endif
 
 .PHONY: all clean