Of course, I forgot to commit the new file in revision 22049...

[reactos.git] / reactos / Makefile

diff --git a/reactos/Makefile b/reactos/Makefile
index f685a8a..31c35e8 100644 (file)
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -129,6 +129,8 @@ endif
 
 .PHONY: all
 .PHONY: clean
+.PHONY: world
+.PHONY: universe
 
 ifeq ($(ROS_AUTOMAKE),)
 ROS_AUTOMAKE=makefile.auto
@@ -336,12 +338,12 @@ endif
 
 
 NTOSKRNL_MC = ntoskrnl$(SEP)ntoskrnl.mc
-KERNEL32_MC = lib$(SEP)kernel32$(SEP)kernel32.mc
+KERNEL32_MC = dll$(SEP)win32$(SEP)kernel32$(SEP)kernel32.mc
 BUILDNO_H = include$(SEP)reactos$(SEP)buildno.h
 BUGCODES_H = include$(SEP)reactos$(SEP)bugcodes.h
 BUGCODES_RC = ntoskrnl$(SEP)bugcodes.rc
 ERRCODES_H = include$(SEP)reactos$(SEP)errcodes.h
-ERRCODES_RC = lib$(SEP)kernel32$(SEP)errcodes.rc
+ERRCODES_RC = dll$(SEP)win32$(SEP)kernel32$(SEP)errcodes.rc
 
 include lib/lib.mak
 include tools/tools.mak
@@ -363,6 +365,28 @@ $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
        $(ECHO_RBUILD)
        $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) mingw
 
+world: all bootcd livecd
+
+universe:
+       $(MAKE) KDBG=1 DBG=1 \
+               ROS_AUTOMAKE=makefile-$(ARCH)-kd.auto \
+               ROS_INSTALL=reactos-$(ARCH)-kd \
+               ROS_INTERMEDIATE=obj-$(ARCH)-kd \
+               ROS_OUTPUT=output-$(ARCH)-kd \
+               world
+       $(MAKE) KDBG=0 DBG=1 \
+               ROS_AUTOMAKE=makefile-$(ARCH)-d.auto \
+               ROS_INSTALL=reactos-$(ARCH)-d \
+               ROS_INTERMEDIATE=obj-$(ARCH)-d \
+               ROS_OUTPUT=output-$(ARCH)-d \
+               world
+       $(MAKE) KDBG=0 DBG=0 \
+               ROS_AUTOMAKE=makefile-$(ARCH)-r.auto \
+               ROS_INSTALL=reactos-$(ARCH)-r \
+               ROS_INTERMEDIATE=obj-$(ARCH)-r \
+               ROS_OUTPUT=output-$(ARCH)-r \
+               world
+
 .PHONY: msvc
 msvc: $(RBUILD_TARGET)
        $(ECHO_RBUILD)
@@ -485,4 +509,4 @@ clean: makefile_auto_clean
 .PHONY: depends
 depends:
        @-$(rm) makefile.auto
-       @$(MAKE) $(filter-out depends, $(MAKECMDGOALS))
\ No newline at end of file
+       @$(MAKE) $(filter-out depends, $(MAKECMDGOALS))