Added 'world' and 'universe' targets (suggested by oiaohm)

svn path=/trunk/; revision=21216

diff --git a/reactos/Makefile b/reactos/Makefile
index af0aab6..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
@@ -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)