temporarily disable -Werror for tools, there seem to be differences between versions...

[reactos.git] / reactos / tools / tools.mak

diff --git a/reactos/tools/tools.mak b/reactos/tools/tools.mak
index c59592c..0791b81 100644 (file)
--- a/reactos/tools/tools.mak
+++ b/reactos/tools/tools.mak
@@ -1,69 +1,37 @@
-# We have to put rmkdir in $(INTERMEDIATE) and not $(INTERMEDIATE)tools
-# since GNU make will always remake directory targets and we can't do the
-# .created file trick for rmkdir due to circular dependencies
-
-RMKDIR_BASE = tools
-
-RMKDIR_TARGET = \
-       $(INTERMEDIATE)rmkdir$(EXEPOSTFIX)
-
-RMKDIR_SOURCES = \
-       $(RMKDIR_BASE)$(SEP)rmkdir.c
-
-RMKDIR_OBJECTS = \
-       $(INTERMEDIATE)rmkdir.o
-
-RMKDIR_HOST_CFLAGS = -g -Werror -Wall
-
-RMKDIR_HOST_LFLAGS = -g
-
-$(RMKDIR_TARGET): $(RMKDIR_OBJECTS)
-       $(ECHO_LD)
-       ${host_gcc} $(RMKDIR_OBJECTS) $(RMKDIR_HOST_LFLAGS) -o $(RMKDIR_TARGET)
-
-$(INTERMEDIATE)rmkdir.o: $(RMKDIR_BASE)$(SEP)rmkdir.c
-       $(ECHO_CC)
-       ${host_gcc} $(RMKDIR_HOST_CFLAGS) -c $(RMKDIR_BASE)$(SEP)rmkdir.c -o $(INTERMEDIATE)rmkdir.o
-
-.PHONY: rmkdir_clean
-rmkdir_clean:
-       -@$(rm) $(RMKDIR_TARGET) $(RMKDIR_OBJECTS) 2>$(NUL)
-clean: rmkdir_clean
-
-
-RSYM_BASE = tools
-
-RSYM_TARGET = \
-       $(INTERMEDIATE)$(RSYM_BASE)$(SEP)rsym$(EXEPOSTFIX)
-
-RSYM_SOURCES = \
-       $(RSYM_BASE)$(SEP)rsym.c
-
-RSYM_OBJECTS = \
-       $(RSYM_SOURCES:.c=.o)
-
-RSYM_HOST_CFLAGS = -g -Werror -Wall
-
-RSYM_HOST_LFLAGS = -g
-
-$(RSYM_TARGET): $(RSYM_OBJECTS)
-       $(ECHO_LD)
-       ${host_gcc} $(RSYM_OBJECTS) $(RSYM_HOST_LFLAGS) -o $(RSYM_TARGET)
-
-$(RSYM_OBJECTS): %.o : %.c
-       $(ECHO_CC)
-       ${host_gcc} $(RSYM_HOST_CFLAGS) -c $< -o $@
-
-.PHONY: rsym_clean
-rsym_clean:
-       -@$(rm) $(RSYM_TARGET) $(RSYM_OBJECTS) 2>$(NUL)
-clean: rsym_clean
-
+TOOLS_BASE = tools
+TOOLS_BASE_ = $(TOOLS_BASE)$(SEP)
+TOOLS_INT = $(INTERMEDIATE_)$(TOOLS_BASE)
+TOOLS_INT_ = $(TOOLS_INT)$(SEP)
+TOOLS_OUT = $(OUTPUT_)$(TOOLS_BASE)
+TOOLS_OUT_ = $(TOOLS_OUT)$(SEP)
+
+TOOLS_CFLAGS = -Wall -Wpointer-arith -Wno-strict-aliasing
+TOOLS_CPPFLAGS = -Wall -Wpointer-arith
+TOOLS_LFLAGS =
+
+$(TOOLS_INT): | $(INTERMEDIATE)
+       $(ECHO_MKDIR)
+       ${mkdir} $@
+
+ifneq ($(INTERMEDIATE),$(OUTPUT))
+$(TOOLS_OUT): | $(OUTPUT)
+       $(ECHO_MKDIR)
+       ${mkdir} $@
+endif
+
+
+include tools/bin2c.mak
+include tools/rsym.mak
+include tools/bin2res/bin2res.mak
 include tools/buildno/buildno.mak
+include tools/cabman/cabman.mak
 include tools/cdmake/cdmake.mak
+include tools/gendib/gendib.mak
+include tools/mkhive/mkhive.mak
 include tools/nci/nci.mak
 include tools/rbuild/rbuild.mak
 include tools/unicode/unicode.mak
+include tools/widl/widl.mak
 include tools/winebuild/winebuild.mak
 include tools/wmc/wmc.mak
 include tools/wpp/wpp.mak