[ros-diffs] [mpiulachs] 31410: Move ntstatus.h/rc generation from Makefile to ntdll.rbuild

Author: mpiulachs
Date: Sun Dec 23 03:55:02 2007
New Revision: 31410

URL: http://svn.reactos.org/svn/reactos?rev=31410&view=rev
Log:
Move ntstatus.h/rc generation from Makefile to ntdll.rbuild

Modified:
    trunk/reactos/Makefile
    trunk/reactos/dll/ntdll/ntdll.rbuild

Modified: trunk/reactos/Makefile
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=31410&r1=…
==============================================================================
--- trunk/reactos/Makefile (original)
+++ trunk/reactos/Makefile Sun Dec 23 03:55:02 2007
@@ -372,11 +372,7 @@
 	${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 @@
 	$(BIN2C_TARGET) \
 	$(BIN2RES_TARGET) \
 	$(BUILDNO_H) \
-	$(NTSTATUS_H) \
-	$(NTSTATUS_RC) \
 	$(GENDIB_DIB_FILES) \
 	$(NCI_SERVICE_FILES)
 ifeq ($(ARCH),powerpc)
@@ -460,11 +454,6 @@
 	$(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)

Modified: trunk/reactos/dll/ntdll/ntdll.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev…
==============================================================================
--- trunk/reactos/dll/ntdll/ntdll.rbuild (original)
+++ trunk/reactos/dll/ntdll/ntdll.rbuild Sun Dec 23 03:55:02 2007
@@ -53,4 +53,8 @@
 	<directory name="." root="intermediate">
 		<file>napi.S</file>
 	</directory>
+
+	<directory name="def">
+		<file>ntstatus.mc</file>
+	</directory>
 </module>