From 256a24ca4283b00c72a18a2ce756274bfc301a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Wed, 5 Sep 2007 09:22:14 +0000 Subject: [PATCH] Let tools including the version number depend of buildno.h Remove useless tool tools-check (replaced by a rbuild check) Add .phony targets for gendib and nci svn path=/trunk/; revision=28869 --- reactos/tools/bin2res/bin2res.mak | 8 ++++--- reactos/tools/gendib/gendib.mak | 3 +++ reactos/tools/nci/nci.mak | 3 +++ reactos/tools/tools-check.c | 32 --------------------------- reactos/tools/tools-check.mak | 22 ------------------ reactos/tools/widl/widl.mak | 28 ++++++++++++----------- reactos/tools/winebuild/winebuild.mak | 22 ++++++++++-------- reactos/tools/wmc/wmc.mak | 17 ++++++++------ reactos/tools/wpp/wpp.mak | 12 +++++----- reactos/tools/wrc/wrc.mak | 27 ++++++++++++---------- 10 files changed, 71 insertions(+), 103 deletions(-) delete mode 100644 reactos/tools/tools-check.c delete mode 100644 reactos/tools/tools-check.mak diff --git a/reactos/tools/bin2res/bin2res.mak b/reactos/tools/bin2res/bin2res.mak index cead4d9e90b..eba3cd35fb9 100644 --- a/reactos/tools/bin2res/bin2res.mak +++ b/reactos/tools/bin2res/bin2res.mak @@ -18,6 +18,8 @@ endif BIN2RES_TARGET = \ $(EXEPREFIX)$(BIN2RES_OUT_)bin2res$(EXEPOSTFIX) +BIN2RES_DEPENDS = $(BUILDNO_H) + BIN2RES_SOURCES = $(addprefix $(BIN2RES_BASE_), \ bin2res.c \ mkstemps.c \ @@ -26,7 +28,7 @@ BIN2RES_SOURCES = $(addprefix $(BIN2RES_BASE_), \ BIN2RES_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(BIN2RES_SOURCES:.c=.o)) -BIN2RES_HOST_CFLAGS = -Iinclude/reactos/wine -D__REACTOS__ $(TOOLS_CFLAGS) +BIN2RES_HOST_CFLAGS = -Iinclude/reactos/wine -I$(INTERMEDIATE_)include -D__REACTOS__ $(TOOLS_CFLAGS) BIN2RES_HOST_LFLAGS = $(TOOLS_LFLAGS) @@ -34,11 +36,11 @@ $(BIN2RES_TARGET): $(BIN2RES_OBJECTS) | $(BIN2RES_OUT) $(ECHO_LD) ${host_gcc} $(BIN2RES_OBJECTS) $(BIN2RES_HOST_LFLAGS) -o $@ -$(BIN2RES_INT_)bin2res.o: $(BIN2RES_BASE_)bin2res.c | $(BIN2RES_INT) +$(BIN2RES_INT_)bin2res.o: $(BIN2RES_BASE_)bin2res.c $(BIN2RES_DEPENDS) | $(BIN2RES_INT) $(ECHO_CC) ${host_gcc} $(BIN2RES_HOST_CFLAGS) -c $< -o $@ -$(BIN2RES_INT_)mkstemps.o: $(BIN2RES_BASE_)mkstemps.c | $(BIN2RES_INT) +$(BIN2RES_INT_)mkstemps.o: $(BIN2RES_BASE_)mkstemps.c $(BIN2RES_DEPENDS) | $(BIN2RES_INT) $(ECHO_CC) ${host_gcc} $(BIN2RES_HOST_CFLAGS) -c $< -o $@ diff --git a/reactos/tools/gendib/gendib.mak b/reactos/tools/gendib/gendib.mak index 3a91e15635f..46ad198f234 100644 --- a/reactos/tools/gendib/gendib.mak +++ b/reactos/tools/gendib/gendib.mak @@ -36,6 +36,9 @@ $(GENDIB_INT_)gendib.o: $(GENDIB_BASE_)gendib.c | $(GENDIB_INT) $(ECHO_CC) ${host_gcc} $(GENDIB_HOST_CFLAGS) -c $< -o $@ +.PHONY: gendib +gendib: $(GENDIB_TARGET) + .PHONY: gendib_clean gendib_clean: -@$(rm) $(GENDIB_TARGET) $(GENDIB_OBJECTS) 2>$(NUL) diff --git a/reactos/tools/nci/nci.mak b/reactos/tools/nci/nci.mak index d9cb270a055..d2cc8bf1c0d 100644 --- a/reactos/tools/nci/nci.mak +++ b/reactos/tools/nci/nci.mak @@ -36,6 +36,9 @@ $(NCI_INT_)ncitool.o: $(NCI_BASE_)ncitool.c | $(NCI_INT) $(ECHO_CC) ${host_gcc} $(NCI_HOST_CFLAGS) -c $< -o $@ +.PHONY: nci +nci: $(NCI_TARGET) + .PHONY: nci_clean nci_clean: -@$(rm) $(NCI_TARGET) $(NCI_OBJECTS) 2>$(NUL) diff --git a/reactos/tools/tools-check.c b/reactos/tools/tools-check.c deleted file mode 100644 index 31c11258732..00000000000 --- a/reactos/tools/tools-check.c +++ /dev/null @@ -1,32 +0,0 @@ -#include "tools-check.h" - -/* - * - Binutils older than 2003/10/01 have broken windres which can't handle - * icons with alpha channel. - * - Binutils between 2004/09/02 and 2004/10/08 have broken handling of - * forward exports in dlltool. - */ - -#if (BINUTILS_VERSION_DATE >= 20040902 && BINUTILS_VERSION_DATE <= 20041008) || \ - (BINUTILS_VERSION_DATE < 20031001) -#error "Due to technical reasons your binutils version can't be used to" \ - "build ReactOS. Please consider upgrading to newer version. See" \ - "www.mingw.org for details." -#endif - -/* - * GCC 3.3.1 is lowest allowed version. Older versions have various problems - * with C++ code. - */ - -#if (__GNUC__ == 3 && __GNUC_MINOR__ < 3) || \ - (__GNUC__ < 3) -#error "Due to technical reasons your GCC version can't be used to" \ - "build ReactOS. Please consider upgrading to newer version. See" \ - "www.mingw.org for details." -#endif - -/* - * FIXME: GCC 3.4.1 has broken headers which cause Explorer to not build. - * We should warn in this case...maybe add check for the broken headers? - */ diff --git a/reactos/tools/tools-check.mak b/reactos/tools/tools-check.mak deleted file mode 100644 index 7a3f6f8e490..00000000000 --- a/reactos/tools/tools-check.mak +++ /dev/null @@ -1,22 +0,0 @@ -PATH_TO_TOP = .. -include $(PATH_TO_TOP)/rules.mak - -# -# Get the binutils version -# -# The "ld -v" output can be in either of these two formats: -# "GNU ld version 050113 20050113" (nightly build) -# "GNU ld version 2.15.94 20050118" (official release) -# - -BINUTILS_VERSION_DATE=$(word 5,$(shell $(PREFIX)ld -v)) - -all: -ifeq ($(HOST_TYPE),unix) - @echo "#define BINUTILS_VERSION_DATE $(BINUTILS_VERSION_DATE)" > tools-check.h -else - @echo #define BINUTILS_VERSION_DATE $(BINUTILS_VERSION_DATE) > tools-check.h -endif - $(HOST_CC) -c tools-check.c -o tools-check.temp - $(RM) tools-check.temp - $(RM) tools-check.h diff --git a/reactos/tools/widl/widl.mak b/reactos/tools/widl/widl.mak index 4407d163c3c..e836dea9648 100644 --- a/reactos/tools/widl/widl.mak +++ b/reactos/tools/widl/widl.mak @@ -35,6 +35,8 @@ endif WIDL_TARGET = \ $(EXEPREFIX)$(WIDL_OUT_)widl$(EXEPOSTFIX) +WIDL_DEPENDS = $(BUILDNO_H) + WIDL_SOURCES = $(addprefix $(WIDL_BASE_), \ client.c \ hash.c \ @@ -70,55 +72,55 @@ $(WIDL_TARGET): $(WIDL_OBJECTS) $(WIDL_LIBS) | $(WIDL_OUT) $(ECHO_LD) ${host_gcc} $(WIDL_OBJECTS) $(WIDL_LIBS) $(WIDL_HOST_LFLAGS) -o $@ -$(WIDL_INT_)client.o: $(WIDL_BASE_)client.c | $(WIDL_INT) +$(WIDL_INT_)client.o: $(WIDL_BASE_)client.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)hash.o: $(WIDL_BASE_)hash.c | $(WIDL_INT) +$(WIDL_INT_)hash.o: $(WIDL_BASE_)hash.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)header.o: $(WIDL_BASE_)header.c | $(WIDL_INT) +$(WIDL_INT_)header.o: $(WIDL_BASE_)header.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)lex.yy.o: $(WIDL_BASE_)lex.yy.c | $(WIDL_INT) +$(WIDL_INT_)lex.yy.o: $(WIDL_BASE_)lex.yy.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)proxy.o: $(WIDL_BASE_)proxy.c | $(WIDL_INT) +$(WIDL_INT_)proxy.o: $(WIDL_BASE_)proxy.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)server.o: $(WIDL_BASE_)server.c | $(WIDL_INT) +$(WIDL_INT_)server.o: $(WIDL_BASE_)server.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)typegen.o: $(WIDL_BASE_)typegen.c | $(WIDL_INT) +$(WIDL_INT_)typegen.o: $(WIDL_BASE_)typegen.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)typelib.o: $(WIDL_BASE_)typelib.c | $(WIDL_INT) +$(WIDL_INT_)typelib.o: $(WIDL_BASE_)typelib.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)utils.o: $(WIDL_BASE_)utils.c | $(WIDL_INT) +$(WIDL_INT_)utils.o: $(WIDL_BASE_)utils.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)widl.o: $(WIDL_BASE_)widl.c | $(WIDL_INT) +$(WIDL_INT_)widl.o: $(WIDL_BASE_)widl.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)write_msft.o: $(WIDL_BASE_)write_msft.c | $(WIDL_INT) +$(WIDL_INT_)write_msft.o: $(WIDL_BASE_)write_msft.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_INT_)parser.tab.o: $(WIDL_BASE_)parser.tab.c | $(WIDL_INT) +$(WIDL_INT_)parser.tab.o: $(WIDL_BASE_)parser.tab.c $(WIDL_DEPENDS) | $(WIDL_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ -$(WIDL_PORT_INT_)mkstemps.o: $(WIDL_PORT_BASE_)mkstemps.c | $(WIDL_PORT_INT) +$(WIDL_PORT_INT_)mkstemps.o: $(WIDL_PORT_BASE_)mkstemps.c $(WIDL_DEPENDS) | $(WIDL_PORT_INT) $(ECHO_CC) ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ diff --git a/reactos/tools/winebuild/winebuild.mak b/reactos/tools/winebuild/winebuild.mak index 11208c1d0bc..451ae722fb5 100644 --- a/reactos/tools/winebuild/winebuild.mak +++ b/reactos/tools/winebuild/winebuild.mak @@ -18,6 +18,8 @@ endif WINEBUILD_TARGET = \ $(EXEPREFIX)$(WINEBUILD_OUT_)winebuild$(EXEPOSTFIX) +WINEBUILD_DEPENDS = $(BUILDNO_H) + WINEBUILD_SOURCES = $(addprefix $(WINEBUILD_BASE_), \ import.c \ main.c \ @@ -32,7 +34,9 @@ WINEBUILD_SOURCES = $(addprefix $(WINEBUILD_BASE_), \ WINEBUILD_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(WINEBUILD_SOURCES:.c=.o)) -WINEBUILD_HOST_CFLAGS = $(TOOLS_CFLAGS) -D__USE_W32API -Iinclude/reactos/wine -Iinclude -Iinclude/reactos -Iinclude/psdk +WINEBUILD_HOST_CFLAGS = $(TOOLS_CFLAGS) -D__USE_W32API \ + -Iinclude/reactos/wine -Iinclude -Iinclude/reactos -Iinclude/psdk \ + -I$(INTERMEDIATE_)include WINEBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS) @@ -43,35 +47,35 @@ $(WINEBUILD_TARGET): $(WINEBUILD_OBJECTS) | $(WINEBUILD_OUT) $(ECHO_LD) ${host_gcc} $(WINEBUILD_OBJECTS) $(WINEBUILD_HOST_LFLAGS) -o $@ -$(WINEBUILD_INT_)import.o: $(WINEBUILD_BASE_)import.c | $(WINEBUILD_INT) +$(WINEBUILD_INT_)import.o: $(WINEBUILD_BASE_)import.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) $(ECHO_CC) ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ -$(WINEBUILD_INT_)main.o: $(WINEBUILD_BASE_)main.c | $(WINEBUILD_INT) +$(WINEBUILD_INT_)main.o: $(WINEBUILD_BASE_)main.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) $(ECHO_CC) ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ -$(WINEBUILD_INT_)parser.o: $(WINEBUILD_BASE_)parser.c | $(WINEBUILD_INT) +$(WINEBUILD_INT_)parser.o: $(WINEBUILD_BASE_)parser.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) $(ECHO_CC) ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ -$(WINEBUILD_INT_)res16.o: $(WINEBUILD_BASE_)res16.c | $(WINEBUILD_INT) +$(WINEBUILD_INT_)res16.o: $(WINEBUILD_BASE_)res16.c $(WINEBUILD_DEPENDS | $(WINEBUILD_INT) $(ECHO_CC) ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ -$(WINEBUILD_INT_)res32.o: $(WINEBUILD_BASE_)res32.c | $(WINEBUILD_INT) +$(WINEBUILD_INT_)res32.o: $(WINEBUILD_BASE_)res32.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) $(ECHO_CC) ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ -$(WINEBUILD_INT_)spec32.o: $(WINEBUILD_BASE_)spec32.c | $(WINEBUILD_INT) +$(WINEBUILD_INT_)spec32.o: $(WINEBUILD_BASE_)spec32.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) $(ECHO_CC) ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ -$(WINEBUILD_INT_)utils.o: $(WINEBUILD_BASE_)utils.c | $(WINEBUILD_INT) +$(WINEBUILD_INT_)utils.o: $(WINEBUILD_BASE_)utils.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) $(ECHO_CC) ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ -$(WINEBUILD_INT_)mkstemps.o: $(WINEBUILD_BASE_)mkstemps.c | $(WINEBUILD_INT) +$(WINEBUILD_INT_)mkstemps.o: $(WINEBUILD_BASE_)mkstemps.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) $(ECHO_CC) ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ diff --git a/reactos/tools/wmc/wmc.mak b/reactos/tools/wmc/wmc.mak index fa3800326ba..9eb5e5af1a2 100644 --- a/reactos/tools/wmc/wmc.mak +++ b/reactos/tools/wmc/wmc.mak @@ -18,6 +18,8 @@ endif WMC_TARGET = \ $(EXEPREFIX)$(WMC_OUT_)wmc$(EXEPOSTFIX) +WMC_DEPENDS = $(BUILDNO_H) + WMC_SOURCES = $(addprefix $(WMC_BASE_), \ lang.c \ mcl.c \ @@ -32,7 +34,8 @@ WMC_OBJECTS = \ WMC_HOST_CFLAGS = -I$(WMC_BASE) $(TOOLS_CFLAGS) \ -D__USE_W32API -DWINE_UNICODE_API= -I$(UNICODE_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk + -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \ + -I$(INTERMEDIATE_)/include WMC_HOST_LFLAGS = $(TOOLS_LFLAGS) @@ -45,27 +48,27 @@ $(WMC_TARGET): $(WMC_OBJECTS) $(WMC_LIBS) | $(WMC_OUT) $(ECHO_LD) ${host_gcc} $(WMC_OBJECTS) $(WMC_LIBS) $(WMC_HOST_LFLAGS) -o $@ -$(WMC_INT_)lang.o: $(WMC_BASE_)lang.c | $(WMC_INT) +$(WMC_INT_)lang.o: $(WMC_BASE_)lang.c $(WMC_DEPENDS) | $(WMC_INT) $(ECHO_CC) ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ -$(WMC_INT_)mcl.o: $(WMC_BASE_)mcl.c | $(WMC_INT) +$(WMC_INT_)mcl.o: $(WMC_BASE_)mcl.c $(WMC_DEPENDS) | $(WMC_INT) $(ECHO_CC) ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ -$(WMC_INT_)utils.o: $(WMC_BASE_)utils.c | $(WMC_INT) +$(WMC_INT_)utils.o: $(WMC_BASE_)utils.c $(WMC_DEPENDS) | $(WMC_INT) $(ECHO_CC) ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ -$(WMC_INT_)wmc.o: $(WMC_BASE_)wmc.c | $(WMC_INT) +$(WMC_INT_)wmc.o: $(WMC_BASE_)wmc.c $(WMC_DEPENDS) | $(WMC_INT) $(ECHO_CC) ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ -$(WMC_INT_)write.o: $(WMC_BASE_)write.c | $(WMC_INT) +$(WMC_INT_)write.o: $(WMC_BASE_)write.c $(WMC_DEPENDS) | $(WMC_INT) $(ECHO_CC) ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ -$(WMC_INT_)mcy.tab.o: $(WMC_BASE_)mcy.tab.c | $(WMC_INT) +$(WMC_INT_)mcy.tab.o: $(WMC_BASE_)mcy.tab.c $(WMC_DEPENDS) | $(WMC_INT) $(ECHO_CC) ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ diff --git a/reactos/tools/wpp/wpp.mak b/reactos/tools/wpp/wpp.mak index f58a361cbf8..dac55d81c8a 100644 --- a/reactos/tools/wpp/wpp.mak +++ b/reactos/tools/wpp/wpp.mak @@ -18,6 +18,8 @@ endif WPP_TARGET = \ $(WPP_OUT_)libwpp.a +WPP_DEPENDS = $(BUILDNO_H) + WPP_SOURCES = $(addprefix $(WPP_BASE_), \ lex.yy.c \ preproc.c \ @@ -28,7 +30,7 @@ WPP_SOURCES = $(addprefix $(WPP_BASE_), \ WPP_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(WPP_SOURCES:.c=.o)) -WPP_HOST_CFLAGS = -D__USE_W32API -I$(WPP_BASE) -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk $(TOOLS_CFLAGS) +WPP_HOST_CFLAGS = -D__USE_W32API -I$(WPP_BASE) -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk -I$(INTERMEDIATE_)include $(TOOLS_CFLAGS) .PHONY: wpp wpp: $(WPP_TARGET) @@ -37,19 +39,19 @@ $(WPP_TARGET): $(WPP_OBJECTS) | $(WPP_OUT) $(ECHO_AR) ${host_ar} -rc $(WPP_TARGET) $(WPP_OBJECTS) -$(WPP_INT_)lex.yy.o: $(WPP_BASE_)lex.yy.c | $(WPP_INT) +$(WPP_INT_)lex.yy.o: $(WPP_BASE_)lex.yy.c $(WPP_DEPENDS) | $(WPP_INT) $(ECHO_CC) ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ -$(WPP_INT_)preproc.o: $(WPP_BASE_)preproc.c | $(WPP_INT) +$(WPP_INT_)preproc.o: $(WPP_BASE_)preproc.c $(WPP_DEPENDS) | $(WPP_INT) $(ECHO_CC) ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ -$(WPP_INT_)wpp.o: $(WPP_BASE_)wpp.c | $(WPP_INT) +$(WPP_INT_)wpp.o: $(WPP_BASE_)wpp.c $(WPP_DEPENDS) | $(WPP_INT) $(ECHO_CC) ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ -$(WPP_INT_)ppy.tab.o: $(WPP_BASE_)ppy.tab.c | $(WPP_INT) +$(WPP_INT_)ppy.tab.o: $(WPP_BASE_)ppy.tab.c $(WPP_DEPENDS) | $(WPP_INT) $(ECHO_CC) ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ diff --git a/reactos/tools/wrc/wrc.mak b/reactos/tools/wrc/wrc.mak index 90c978aa8d6..6e4585cb8ee 100644 --- a/reactos/tools/wrc/wrc.mak +++ b/reactos/tools/wrc/wrc.mak @@ -35,6 +35,8 @@ endif WRC_TARGET = \ $(EXEPREFIX)$(WRC_OUT_)wrc$(EXEPOSTFIX) +WRC_DEPENDS = $(BUILDNO_H) + WRC_SOURCES = $(addprefix $(WRC_BASE_), \ dumpres.c \ genres.c \ @@ -56,7 +58,8 @@ WRC_HOST_CFLAGS = -I$(WRC_BASE) $(TOOLS_CFLAGS) \ -D__USE_W32API -DWINE_UNICODE_API= \ -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ -I$(UNICODE_BASE) -I$(WPP_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk + -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \ + -I$(INTERMEDIATE_)include WRC_HOST_LFLAGS = $(TOOLS_LFLAGS) @@ -69,47 +72,47 @@ $(WRC_TARGET): $(WRC_OBJECTS) $(WRC_LIBS) | $(WRC_OUT) $(ECHO_LD) ${host_gcc} $(WRC_OBJECTS) $(WRC_LIBS) $(WRC_HOST_LFLAGS) -o $@ -$(WRC_INT_)dumpres.o: $(WRC_BASE_)dumpres.c | $(WRC_INT) +$(WRC_INT_)dumpres.o: $(WRC_BASE_)dumpres.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_INT_)genres.o: $(WRC_BASE_)genres.c | $(WRC_INT) +$(WRC_INT_)genres.o: $(WRC_BASE_)genres.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_INT_)newstruc.o: $(WRC_BASE_)newstruc.c | $(WRC_INT) +$(WRC_INT_)newstruc.o: $(WRC_BASE_)newstruc.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_INT_)readres.o: $(WRC_BASE_)readres.c | $(WRC_INT) +$(WRC_INT_)readres.o: $(WRC_BASE_)readres.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_INT_)translation.o: $(WRC_BASE_)translation.c | $(WRC_INT) +$(WRC_INT_)translation.o: $(WRC_BASE_)translation.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_INT_)utils.o: $(WRC_BASE_)utils.c | $(WRC_INT) +$(WRC_INT_)utils.o: $(WRC_BASE_)utils.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_INT_)wrc.o: $(WRC_BASE_)wrc.c | $(WRC_INT) +$(WRC_INT_)wrc.o: $(WRC_BASE_)wrc.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_INT_)writeres.o: $(WRC_BASE_)writeres.c | $(WRC_INT) +$(WRC_INT_)writeres.o: $(WRC_BASE_)writeres.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_INT_)parser.tab.o: $(WRC_BASE_)parser.tab.c | $(WRC_INT) +$(WRC_INT_)parser.tab.o: $(WRC_BASE_)parser.tab.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_INT_)lex.yy.o: $(WRC_BASE_)lex.yy.c | $(WRC_INT) +$(WRC_INT_)lex.yy.o: $(WRC_BASE_)lex.yy.c $(WRC_DEPENDS) | $(WRC_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ -$(WRC_PORT_INT_)mkstemps.o: $(WRC_PORT_BASE_)mkstemps.c | $(WRC_PORT_INT) +$(WRC_PORT_INT_)mkstemps.o: $(WRC_PORT_BASE_)mkstemps.c $(WRC_DEPENDS) | $(WRC_PORT_INT) $(ECHO_CC) ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@