update for HEAD-2003091401

[reactos.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 5f7f828..c212e70 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,15 +3,19 @@ PATH_TO_TOP = ..
 TOOLS = \
   buildno$(EXE_POSTFIX) \
   depends$(EXE_POSTFIX) \
+  regtests$(EXE_POSTFIX) \
   rcopy$(EXE_POSTFIX) \
   rdel$(EXE_POSTFIX) \
+  rline$(EXE_POSTFIX) \
   rmkdir$(EXE_POSTFIX) \
   rrmdir$(EXE_POSTFIX) \
-  rsym$(EXE_POSTFIX)
+  rsym$(EXE_POSTFIX) \
+  rtouch$(EXE_POSTFIX) \
+  mkflpimg$(EXE_POSTFIX)
 
 CLEAN_FILES = $(TOOLS)
 
-all: $(TOOLS) wmc_directory_target
+all: $(TOOLS) zlib_target wmc_target cabman_target cdmake_target mkhive_target rgenstat_target
 
 buildno$(EXE_POSTFIX): buildno.c ../include/reactos/version.h
        $(HOST_CC) $(CFLAGS) -o buildno$(EXE_POSTFIX) buildno.c
@@ -20,6 +24,9 @@ buildno$(EXE_POSTFIX): buildno.c ../include/reactos/version.h
 depends$(EXE_POSTFIX): depends.c
        $(HOST_CC) $(CFLAGS) -o depends$(EXE_POSTFIX) depends.c
 
+regtests$(EXE_POSTFIX): regtests.c
+       $(HOST_CC) $(CFLAGS) -o regtests$(EXE_POSTFIX) regtests.c
+
 ifeq ($(HOST),mingw32-linux)
 rcopy$(EXE_POSTFIX): rcopy.c
        $(HOST_CC) $(CFLAGS) -DUNIX_PATHS rcopy.c -o rcopy$(EXE_POSTFIX)
@@ -33,6 +40,15 @@ rdel$(EXE_POSTFIX): rdel.c
        $(HOST_CC) $(CFLAGS) rdel.c -o rdel$(EXE_POSTFIX)
 
 ifeq ($(HOST),mingw32-linux)
+rline$(EXE_POSTFIX): rline.c
+       $(HOST_CC) $(CFLAGS) -DUNIX_PATHS rline.c -o rline$(EXE_POSTFIX)
+endif
+ifeq ($(HOST),mingw32-windows)
+rline$(EXE_POSTFIX): rmkdir.c
+       $(HOST_CC) $(CFLAGS) -DDOS_PATHS rline.c -o rline$(EXE_POSTFIX)
+endif
+
+ifeq ($(HOST),mingw32-linux)
 rmkdir$(EXE_POSTFIX): rmkdir.c
        $(HOST_CC) $(CFLAGS) -DUNIX_PATHS rmkdir.c -o rmkdir$(EXE_POSTFIX)
 endif
@@ -59,18 +75,61 @@ rsym$(EXE_POSTFIX): rsym.c
        $(HOST_CC) $(CFLAGS) -DDOS_PATHS rsym.c -o rsym$(EXE_POSTFIX)
 endif
 
-wmc_directory_target:
-       make -C wmc wmc$(EXE_POSTFIX)
+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
+
+ifeq ($(HOST),mingw32-linux)
+mkflpimg$(EXE_POSTFIX): mkflpimg.c
+       $(HOST_CC) $(CFLAGS) -DUNIX_PATHS mkflpimg.c -o mkflpimg$(EXE_POSTFIX)
+endif
+ifeq ($(HOST),mingw32-windows)
+mkflpimg$(EXE_POSTFIX): mkflpimg.c
+       $(HOST_CC) $(CFLAGS) -DDOS_PATHS mkflpimg.c -o mkflpimg$(EXE_POSTFIX)
+endif
+
+
+zlib_target:
+       $(MAKE) -C ../lib/zlib -f Makefile.host
+
+wmc_target:
+       $(MAKE) -C wmc wmc$(EXE_POSTFIX)
+
+cabman_target:
+       $(MAKE) -C cabman cabman$(EXE_POSTFIX)
+
+cdmake_target:
+       $(MAKE) -C cdmake cdmake$(EXE_POSTFIX)
+
+mkhive_target:
+       $(MAKE) -C mkhive mkhive$(EXE_POSTFIX)
+
+rgenstat_target:
+       $(MAKE) -C rgenstat rgenstat$(EXE_POSTFIX)
+
+.PHONY: wmc_target cdmake_target mkhive_target rgenstat_target
+
 
 ifeq ($(HOST),mingw32-linux)
 clean:
-       make -C wmc clean
+       $(MAKE) -C cdmake clean
+       $(MAKE) -C mkhive clean
+       $(MAKE) -C wmc clean
+       $(MAKE) -C rgenstat clean
        rm mkconfig
        rm $(TOOLS)
 endif
 ifeq ($(HOST),mingw32-windows)
 clean:
-       make -C wmc clean
+       $(MAKE) -C cdmake clean
+       $(MAKE) -C mkhive clean
+       $(MAKE) -C wmc clean
+       $(MAKE) -C rgenstat clean
        del *$(EXE_POSTFIX)
 endif