From: Marc Piulachs <marc.piulachs@live.com>
Date: Sun, 23 Dec 2007 00:55:02 +0000 (+0000)
Subject: Move ntstatus.h/rc generation from Makefile to ntdll.rbuild
X-Git-Tag: backups/curicon_rewrite@32816~288
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=14b8e0949e41459df29cd227866cb99f5a058c7d

Move ntstatus.h/rc generation from Makefile to ntdll.rbuild

svn path=/trunk/; revision=31410
---

diff --git a/reactos/Makefile b/reactos/Makefile
index 18d9bc4fb4e..5dacbb31827 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -372,11 +372,7 @@ $(OUTPUT):
 	${mkdir} $@
 endif
 
-NTDLL_MC = dll$(SEP)ntdll$(SEP)def$(SEP)ntstatus.mc
 BUILDNO_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)buildno.h
-NTSTATUS_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)ntstatus.h
-NTSTATUS_RC = $(INTERMEDIATE_)dll$(SEP)ntdll$(SEP)def$(SEP)ntstatus.rc
-
 
 include lib/lib.mak
 include tools/tools.mak
@@ -387,8 +383,6 @@ PREAUTO := \
 	$(BIN2C_TARGET) \
 	$(BIN2RES_TARGET) \
 	$(BUILDNO_H) \
-	$(NTSTATUS_H) \
-	$(NTSTATUS_RC) \
 	$(GENDIB_DIB_FILES) \
 	$(NCI_SERVICE_FILES)
 ifeq ($(ARCH),powerpc)
@@ -460,11 +454,6 @@ msvc: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
 	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) msvc
 
-$(NTSTATUS_H) $(NTSTATUS_RC): $(WMC_TARGET) $(NTDLL_MC)
-	${mkdir} $(INTERMEDIATE_)include$(SEP)reactos 2>$(NUL)
-	${mkdir} $(INTERMEDIATE_)dll$(SEP)ntdll$(SEP)def 2>$(NUL)
-	$(ECHO_WMC)
-	$(Q)$(WMC_TARGET) -i -U -H $(NTSTATUS_H) -o $(NTSTATUS_RC) $(NTDLL_MC)
 .PHONY: msvc6
 msvc6: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
diff --git a/reactos/dll/ntdll/ntdll.rbuild b/reactos/dll/ntdll/ntdll.rbuild
index 4d3b131e0bf..e7e16b28b9b 100644
--- a/reactos/dll/ntdll/ntdll.rbuild
+++ b/reactos/dll/ntdll/ntdll.rbuild
@@ -53,4 +53,8 @@
 	<directory name="." root="intermediate">
 		<file>napi.S</file>
 	</directory>
+
+	<directory name="def">
+		<file>ntstatus.mc</file>
+	</directory>
 </module>