[ros-diffs] [royce] 13990: hack fix 'hostzlib' circular dependency, added a couple more stub makefiles, added 'rbuild' phony target

hack fix 'hostzlib' circular dependency, added a couple more stub
makefiles, added 'rbuild' phony target
Modified: branches/xmlbuildsystem/reactos/Makefile
Deleted: branches/xmlbuildsystem/reactos/ntoskrnl/Makefile
Deleted: branches/xmlbuildsystem/reactos/ntoskrnl/Makefile.i386
Added: branches/xmlbuildsystem/reactos/ntoskrnl/makefile
Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak
Deleted: branches/xmlbuildsystem/reactos/tools/unicode/Makefile.in
Added: branches/xmlbuildsystem/reactos/tools/unicode/makefile
Deleted: branches/xmlbuildsystem/reactos/tools/wpp/Makefile.in
  _____  

Modified: branches/xmlbuildsystem/reactos/Makefile
--- branches/xmlbuildsystem/reactos/Makefile	2005-03-13 01:54:53 UTC
(rev 13989)
+++ branches/xmlbuildsystem/reactos/Makefile	2005-03-13 03:16:16 UTC
(rev 13990)
@@ -3,15 +3,10 @@

 all: makefile.auto
 
 ifeq ($(HOST),)
-OSDETECT=$(word 1,$(shell gcc -dumpmachine))
- 
-all: detect_os
-
-detect_os:
-ifeq ($(OSDETECT),mingw32)
-	HOST=mingw32-windows
+ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32)
+HOST=mingw32-windows
 else
-	HOST=mingw32-linux
+HOST=mingw32-linux
 endif
 endif
 
  _____  

Deleted: branches/xmlbuildsystem/reactos/ntoskrnl/Makefile
--- branches/xmlbuildsystem/reactos/ntoskrnl/Makefile	2005-03-13
01:54:53 UTC (rev 13989)
+++ branches/xmlbuildsystem/reactos/ntoskrnl/Makefile	2005-03-13
03:16:16 UTC (rev 13990)
@@ -1,579 +0,0 @@

-preall: all
-
-PATH_TO_TOP := ..
-
-include $(PATH_TO_TOP)/config
-
-TARGET_REGTESTS = yes
-
-TARGET_TYPE = kernel
-
-TARGET_NAME = ntoskrnl
-
-TARGET_BOOTSTRAP = yes
-
-CONFIG :=
-
-ifeq ($(DBG), 1)
-DBG_OR_KDBG := 1
-endif
-ifeq ($(KDBG), 1)
-DBG_OR_KDBG := 1
-endif
-
-LINKER_SCRIPT := ntoskrnl.lnk
-STRIP_FLAGS := -Wl,-s
-
-ifeq ($(KDBG), 1)
-OBJECTS_KDBG := dbg/kdb.o dbg/kdb_serial.o dbg/kdb_keyboard.o
dbg/rdebug.o \
-                dbg/i386/kdb_help.o \
-		../dk/w32/lib/libkjs.a dbg/i386/i386-dis.o
-CFLAGS_KDBG := -I../lib/kjs/include
-preall: all
-
-../dk/w32/lib/libkjs.a:
-	$(MAKE) -C ../lib/kjs
-else
-OBJECTS_KDBG :=
-endif
-ifeq ($(DBG_OR_KDBG), 1)
-OBJECTS_KDBG := $(OBJECTS_KDBG) dbg/kdb_symbols.o dbg/profile.o
-endif
-
-TARGET_ASFLAGS = -I./include
-TARGET_CFLAGS = -I./include $(CFLAGS_KDBG) -Wall -Werror $(CFLAGS_OPT)
-
-# require os code to explicitly request A/W version of
structs/functions
-TARGET_CFLAGS += -D_DISABLE_TIDENTS
-
-# 3GB User Mode Memory Space support
-ifeq ($(3GB), 1)
-TARGET_CFLAGS += -D__3GB__
-TARGET_BASE = 0xC0000000
-else
-TARGET_BASE = 0x80000000
-endif
-
-ifneq ($(DBG), 0)
-TARGET_CFLAGS += -DDBG
-endif
-
-# enable thread event pair features (NT4 only!)
-# TARGET_CFLAGS += -D_ENABLE_THRDEVTPAIR
-
-#
-# Javascript extension for kdb
-#
-
-OBJECTS_PATH = objects
-
-#
-# Architecture specific Makefile
-# Defines $(OBJECTS_ARCH)
-#
-include Makefile.$(ARCH)
-
-# Run-Time Library (Rtl)
-OBJECTS_RTL = \
-	rtl/atom.o \
-	rtl/capture.o \
-	rtl/ctype.o \
-	rtl/handle.o \
-	rtl/message.o \
-	rtl/misc.o \
-	rtl/purecall.o \
-	rtl/regio.o \
-	rtl/sprintf.o \
-	rtl/stdlib.o \
-	rtl/string.o \
-	rtl/swprintf.o \
-	rtl/wstring.o \
-	rtl/nls.o \
-	rtl/rangelist.o \
-	rtl/libsupp.o
-
-OBJECTS_RTL := $(filter-out $(RTL_EXCLUDE_FILTER), $(OBJECTS_RTL))
-
-
-# Kernel (Ke)
-OBJECTS_KE = \
-	ke/apc.o \
-	ke/bug.o \
-	ke/catch.o \
-	ke/clock.o \
-	ke/critical.o \
-	ke/dpc.o \
-	ke/device.o \
-	ke/error.o \
-	ke/event.o \
-	ke/kqueue.o \
-	ke/kthread.o \
-	ke/ipi.o \
-	ke/main.o \
-	ke/mutex.o \
-	ke/process.o \
-	ke/profile.o \
-	ke/queue.o \
-	ke/sem.o \
-	ke/spinlock.o \
-	ke/timer.o \
-	ke/wait.o \
-	ke/alert.o
-
-# Memory Manager (Mm)
-OBJECTS_MM = \
-	mm/anonmem.o \
-	mm/aspace.o \
-	mm/balance.o \
-	mm/cont.o \
-	mm/drvlck.o \
-	mm/elf32.o \
-	mm/elf64.o \
-	mm/freelist.o \
-	mm/iospace.o \
-	mm/kmap.o \
-	mm/marea.o \
-	mm/mdl.o \
-	mm/mm.o \
-	mm/mminit.o \
-	mm/mpw.o \
-	mm/ncache.o \
-	mm/npool.o \
-	mm/pagfault.o \
-	mm/pagefile.o \
-	mm/pageop.o \
-	mm/pager.o \
-	mm/paging.o \
-	mm/pe.o \
-	mm/pool.o \
-	mm/ppool.o \
-	mm/physical.o \
-	mm/region.o \
-	mm/rmap.o \
-	mm/section.o \
-	mm/verifier.o \
-	mm/virtual.o \
-	mm/wset.o
-
-# I/O Subsystem (Io)
-OBJECTS_IO = \
-	io/adapter.o \
-	io/arcname.o \
-	io/bootlog.o \
-	io/buildirp.o \
-	io/cancel.o \
-	io/cleanup.o \
-	io/cntrller.o \
-	io/create.o \
-	io/device.o \
-	io/deviface.o \
-	io/dir.o \
-	io/driver.o \
-	io/efi.o \
-	io/errlog.o \
-	io/error.o \
-	io/event.o \
-	io/file.o \
-	io/flush.o \
-	io/fs.o \
-	io/iocomp.o \
-	io/ioctrl.o \
-	io/iomgr.o \
-	io/iowork.o \
-	io/irp.o \
-	io/irq.o \
-	io/lock.o \
-	io/mailslot.o \
-	io/mdl.o \
-	io/npipe.o \
-	io/page.o \
-	io/parttab.o \
-	io/plugplay.o \
-	io/process.o \
-	io/pnpdma.o \
-	io/pnpmgr.o \
-	io/pnpnotify.o \
-	io/pnpreport.o \
-	io/pnproot.o \
-	io/queue.o \
-	io/rawfs.o \
-	io/remlock.o \
-	io/resource.o \
-	io/rw.o \
-	io/share.o \
-	io/shutdown.o \
-	io/symlink.o \
-	io/timer.o \
-	io/vpb.o \
-	io/wdm.o \
-	io/wmi.o \
-	io/xhaldisp.o \
-	io/xhaldrv.o
-
-# Object Manager (Ob)
-OBJECTS_OB = \
-	ob/dirobj.o \
-	ob/handle.o \
-	ob/namespc.o \
-	ob/ntobj.o \
-	ob/object.o \
-	ob/sdcache.o \
-	ob/security.o \
-	ob/symlink.o
-
-# Process Manager (Ps)
-OBJECTS_PS = \
-	ps/cid.o \
-	ps/create.o \
-	ps/debug.o \
-	ps/idle.o \
-	ps/job.o \
-	ps/kill.o \
-	ps/locale.o \
-	ps/process.o \
-	ps/psmgr.o \
-	ps/suspend.o \
-	ps/thread.o \
-	ps/tinfo.o \
-	ps/win32.o \
-	ps/w32call.o
-
-# Executive Subsystem (Ex)
-OBJECTS_EX = \
-	ex/btree.o \
-	ex/callback.o \
-	ex/event.o \
-	ex/evtpair.o \
-	ex/fmutex.o \
-	ex/hashtab.o \
-	ex/init.o \
-	ex/interlck.o \
-	ex/list.o \
-	ex/lookas.o \
-	ex/mutant.o \
-	ex/napi.o \
-	ex/power.o \
-	ex/profile.o \
-	ex/resource.o \
-	ex/rundown.o \
-	ex/stree.o \
-	ex/sem.o \
-	ex/synch.o \
-	ex/sysinfo.o \
-	ex/time.o \
-	ex/timer.o \
-	ex/util.o \
-	ex/uuid.o \
-	ex/win32k.o \
-	ex/work.o \
-	ex/zone.o \
-	ex/zw.o
-
-# Installable File System Run-Time Library (FsRtl)
-OBJECTS_FS = \
-	fs/dbcsname.o \
-	fs/filelock.o \
-	fs/mcb.o \
-	fs/mdl.o \
-	fs/name.o \
-	fs/notify.o \
-	fs/oplock.o \
-	fs/pool.o \
-	fs/tunnel.o \
-	fs/unc.o \
-	fs/util.o
-
-# Security Subsystem
-OBJECTS_SE = \
-	se/access.o \
-	se/acl.o \
-	se/audit.o \
-	se/lsa.o \
-	se/luid.o \
-	se/priv.o \
-	se/sd.o \
-	se/semgr.o \
-	se/sid.o \
-	se/token.o
-
-# Configuration Manager (Registry)
-OBJECTS_CM = \
-	cm/import.o  \
-	cm/ntfunc.o \
-	cm/regfile.o \
-	cm/registry.o  \
-	cm/regobj.o \
-
-# Debugger Support (Dbg)
-OBJECTS_DBG = \
-	dbg/dbgctrl.o \
-	dbg/errinfo.o \
-	dbg/print.o \
-	dbg/user.o \
-	$(OBJECTS_KDBG)
-
-# Loader
-OBJECTS_LDR = \
-	ldr/init.o \
-	ldr/loader.o \
-	ldr/resource.o \
-	ldr/rtl.o \
-	ldr/sysdll.o \
-	ldr/userldr.o
-
-# Local Procedure Call (Lpc)
-OBJECTS_LPC = \
-	lpc/close.o \
-	lpc/complete.o \
-	lpc/connect.o \
-	lpc/create.o \
-	lpc/listen.o \
-	lpc/port.o \
-	lpc/query.o \
-	lpc/queue.o \
-	lpc/receive.o \
-	lpc/reply.o \
-	lpc/send.o
-
-# Power Management (Po)
-OBJECTS_PO = \
-	po/power.o
-
-# Cache Manager (Cc)
-OBJECTS_CC = \
-	cc/cacheman.o \
-	cc/copy.o \
-	cc/fs.o \
-	cc/pin.o \
-	cc/mdl.o \
-	cc/view.o
-
-# Kernel Debugger Support (Kd)
-OBJECTS_KD = \
-	kd/dlog.o \
-	kd/gdbstub.o \
-	kd/kdebug.o \
-	kd/mda.o \
-	kd/service.o
-
-# Boot video (Inbv)
-OBJECTS_INBV = \
-	inbv/inbv.o
-
-DEP_OBJECTS := $(OBJECTS_MM) $(OBJECTS_ARCH) \
-	$(OBJECTS_IO) $(OBJECTS_KE) $(OBJECTS_OB) \
-	$(OBJECTS_PS) $(OBJECTS_EX) $(OBJECTS_CC) $(OBJECTS_FS)
$(OBJECTS_SE) \
-	$(OBJECTS_DBG) $(OBJECTS_CM) $(OBJECTS_LDR) $(OBJECTS_LPC) \
-	$(OBJECTS_PO) $(OBJECTS_KD) $(OBJECTS_RTL) $(OBJECTS_INBV)
-
-TAG_OBJECTS := $(join $(dir $(DEP_OBJECTS)),$(patsubst %.o, .%.TAG,
$(notdir $(DEP_OBJECTS))))
-
-TARGET_PCH = include/ntoskrnl.h
-
-
-# Resources
-OBJECTS_RESOURCE = \
-	$(TARGET_NAME).coff
-
-$(OBJECTS_PATH):
-	mkdir $(OBJECTS_PATH)
-
-$(OBJECTS_RESOURCE): $(TARGET_NAME).rc bugcodes.rc
$(PATH_TO_TOP)/include/reactos/resource.h
-
-#
-# Build subsystem intermediate objects
-#
-$(OBJECTS_PATH)/arch.o: $(OBJECTS_ARCH)
-	$(LD) -r -o $(OBJECTS_PATH)/arch.o $(OBJECTS_ARCH)
-
-$(OBJECTS_PATH)/io.o: $(OBJECTS_IO)
-	$(LD) \
-		-r \
-		-o $(OBJECTS_PATH)/io.o \
-		$(OBJECTS_IO)
-
-$(OBJECTS_PATH)/ke.o: $(OBJECTS_KE)
-	$(LD) \
-		-r \
-		-o $(OBJECTS_PATH)/ke.o \
-		$(OBJECTS_KE)
-
-$(OBJECTS_PATH)/rtl.o: $(OBJECTS_RTL)
-	$(LD) \
-		-r \
-		-o $(OBJECTS_PATH)/rtl.o \
-		$(OBJECTS_RTL)
-
-$(OBJECTS_PATH)/mm.o: $(OBJECTS_MM)
-	$(LD) \
-		-r \
-		-o $(OBJECTS_PATH)/mm.o \
-		$(OBJECTS_MM)
-
-$(OBJECTS_PATH)/ob.o: $(OBJECTS_OB)
-	$(LD) \
-		-r \
-		-o $(OBJECTS_PATH)/ob.o \
-		$(OBJECTS_OB)
-
-$(OBJECTS_PATH)/ps.o: $(OBJECTS_PS)
-	$(LD) \
-		-r \
-		-o $(OBJECTS_PATH)/ps.o \
-		$(OBJECTS_PS)
-
-$(OBJECTS_PATH)/ex.o: $(OBJECTS_EX)
-	$(LD) \
-		-r \
-		-o $(OBJECTS_PATH)/ex.o \
-		$(OBJECTS_EX)
-
-$(OBJECTS_PATH)/fs.o: $(OBJECTS_FS)
-	$(LD) \
-		-r \
-		-o $(OBJECTS_PATH)/fs.o \
-		$(OBJECTS_FS)
-
-$(OBJECTS_PATH)/se.o: $(OBJECTS_SE)
-	$(LD) \
-		-r \
-		-o $(OBJECTS_PATH)/se.o \
-		$(OBJECTS_SE)
-
-$(OBJECTS_PATH)/cm.o: $(OBJECTS_CM)
-	$(LD) \
-		-r \
-		-o $(OBJECTS_PATH)/cm.o \
-		$(OBJECTS_CM)
-
-$(OBJECTS_PATH)/dbg.o: $(OBJECTS_DBG)
-	$(LD) \
-		-r \
-		-o $(OBJECTS_PATH)/dbg.o \
-		$(OBJECTS_DBG)
-
-$(OBJECTS_PATH)/ldr.o: $(OBJECTS_LDR)
-	$(LD) \
-		-r \
-		-o $(OBJECTS_PATH)/ldr.o \
-		$(OBJECTS_LDR)
-
-$(OBJECTS_PATH)/lpc.o: $(OBJECTS_LPC)
-	$(LD) \
-		-r \
-		-o $(OBJECTS_PATH)/lpc.o \
-		$(OBJECTS_LPC)
-
-$(OBJECTS_PATH)/po.o: $(OBJECTS_PO)
-	$(LD) \
-		-r \
-		-o $(OBJECTS_PATH)/po.o \
-		$(OBJECTS_PO)
-
-$(OBJECTS_PATH)/cc.o: $(OBJECTS_CC)
-	$(LD) \
-		-r \
-		-o $(OBJECTS_PATH)/cc.o \
-		$(OBJECTS_CC)
-
-$(OBJECTS_PATH)/kd.o: $(OBJECTS_KD)
-	$(LD) \
-		-r \
-		-o $(OBJECTS_PATH)/kd.o \
-		$(OBJECTS_KD)
-
-$(OBJECTS_PATH)/inbv.o: $(OBJECTS_INBV)
-	$(LD) \
-		-r \
-		-o $(OBJECTS_PATH)/inbv.o \
-		$(OBJECTS_INBV)
-
-# Note: arch.o MUST be the first file!!!
-OBJECTS := \
-	$(OBJECTS_PATH)/arch.o \
-	$(OBJECTS_PATH)/ke.o \
-	$(OBJECTS_PATH)/cc.o \
-	$(OBJECTS_PATH)/cm.o \
-	$(OBJECTS_PATH)/dbg.o \
-	$(OBJECTS_PATH)/ex.o \
-	$(OBJECTS_PATH)/lpc.o \
-	$(OBJECTS_PATH)/fs.o \
-	$(OBJECTS_PATH)/io.o \
-	$(OBJECTS_PATH)/kd.o \
-	$(OBJECTS_PATH)/ldr.o \
-	$(OBJECTS_PATH)/mm.o \
-	$(OBJECTS_PATH)/ob.o \
-	$(OBJECTS_PATH)/po.o \
-	$(OBJECTS_PATH)/ps.o \
-	$(OBJECTS_PATH)/rtl.o \
-	$(OBJECTS_PATH)/se.o \
-	$(OBJECTS_PATH)/inbv.o \
-	$(OBJECTS_RESOURCE)
-
-EXTRA_OBJECTS = $(PATH_TO_TOP)/include/reactos/bugcodes.h
-
-TARGET_OBJECTS = $(EXTRA_OBJECTS) $(OBJECTS)
-
-TARGET_LIBS = \
-	$(DDK_PATH_LIB)/libhal.a \
-	$(SDK_PATH_LIB)/librtl.a \
-	$(SDK_PATH_LIB)/librossym.a \
-	$(SDK_PATH_LIB)/libstring.a \
-	$(SDK_PATH_LIB)/librosrtl.a \
-	$(SDK_PATH_LIB)/libpseh.a \
-	$(SDK_PATH_LIB)/libwdmguid.a \
-	$(PATH_TO_TOP)/drivers/lib/csq/csq.o
-
-TARGET_LFLAGS = \
-	-Wl,-T,ntoskrnl.lnk \
-	-Wl,--subsystem,native \
-	-Wl,--image-base,$(TARGET_BASE) \
-	-Wl,--file-alignment,0x1000 \
-	-Wl,--section-alignment,0x1000 \
-	-Wl,--entry,_NtProcessStartup \
-	-nostdlib
-
-TARGET_GCCLIBS = gcc
-
-TAGS: $(TAG_OBJECTS)
-	etags $(addprefix -i , $(TAG_OBJECTS))
-
-GENERATED_HEADER_FILES := $(PATH_TO_TOP)/include/reactos/bugcodes.h
-
-$(PATH_TO_TOP)/include/reactos/bugcodes.h bugcodes.rc: ntoskrnl.mc
-	$(MC) \
-		-H $(PATH_TO_TOP)/include/reactos/bugcodes.h \
-		-o bugcodes.rc \
-		$(TARGET_NAME).mc
-
-TARGET_CLEAN = \
-  $(PATH_TO_TOP)/include/reactos/bugcodes.h \
-  $(DEP_OBJECTS) $(DEP_FILES) MSG00409.bin bugcodes.rc
-
-ex/napi.o: ex/zw.S $(PATH_TO_TOP)/include/ntdll/napi.h
-
-ke/main.o: ke/main.c $(PATH_TO_TOP)/include/reactos/buildno.h
-
-$(TARGET_PCH): $(PATH_TO_TOP)/include/reactos/bugcodes.h
-
-
-.%.TAG: %.S
-	etags -o $@ $<
-
-.%.TAG: %.s
-	etags -o $@ $<
-
-.%.TAG: %.c
-	etags -o $@ $^
-
-
-docu:
-	doxygen Doxyfile
-
-.PHONY: docu
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-include $(TOOLS_PATH)/depend.mk
  _____  

Deleted: branches/xmlbuildsystem/reactos/ntoskrnl/Makefile.i386
--- branches/xmlbuildsystem/reactos/ntoskrnl/Makefile.i386
2005-03-13 01:54:53 UTC (rev 13989)
+++ branches/xmlbuildsystem/reactos/ntoskrnl/Makefile.i386
2005-03-13 03:16:16 UTC (rev 13990)
@@ -1,62 +0,0 @@

-#
-# Hardware Abstraction Layer (Hal) for x86 systems
-#
-
-# Defines $(OBJECTS_HAL)
-# include hal/x86/sources
-
-OBJECTS_BOOT := ke/i386/main.o
-
-OBJECTS_EX_I386 := \
-	ex/i386/interlck.o
-
-OBJECTS_KE_I386 := \
-	ke/i386/exp.o \
-	ke/i386/irq.o \
-	ke/i386/irqhand.o \
-	ke/i386/thread.o \
-	ke/i386/usercall.o \
-	ke/i386/trap.o \
-	ke/i386/bthread.o \
-	ke/i386/syscall.o \
-	ke/i386/tskswitch.o \
-	ke/i386/v86m.o \
-	ke/i386/v86m_sup.o \
-	ke/i386/vdm.o \
-	ke/i386/bios.o \
-	ke/i386/i386-mcount.o \
-	ke/i386/gdt.o \
-	ke/i386/idt.o \
-	ke/i386/ldt.o \
-	ke/i386/brkpoint.o \
-	ke/i386/kernel.o \
-	ke/i386/fpu.o \
-	ke/i386/tlbflush.o \
-	ke/i386/tss.o \
-	ke/i386/usertrap.o \
-	ke/i386/stkswitch.o
-
-OBJECTS_MM_I386 := \
-	mm/i386/memsafe.o \
-	mm/i386/page.o \
-	mm/i386/pfault.o
-
-OBJECTS_RTL_I386 := \
-	rtl/i386/alldiv.o \
-	rtl/i386/allmul.o \
-	rtl/i386/allrem.o \
-	rtl/i386/allshl.o \
-	rtl/i386/allshr.o \
-	rtl/i386/aulldiv.o \
-	rtl/i386/aullrem.o \
-	rtl/i386/aullshr.o \
-	rtl/i386/exception.o \
-	rtl/i386/seh.o
-
-OBJECTS_PS_I386 := \
-	ps/i386/continue.o
-
-RTL_EXCLUDE_FILTER := 
-
-OBJECTS_ARCH = $(OBJECTS_BOOT) $(OBJECTS_EX_I386) $(OBJECTS_KE_I386)
$(OBJECTS_MM_I386) \
-  $(OBJECTS_RTL_I386) $(OBJECTS_PS_I386)
  _____  

Added: branches/xmlbuildsystem/reactos/ntoskrnl/makefile
--- branches/xmlbuildsystem/reactos/ntoskrnl/makefile	2005-03-13
01:54:53 UTC (rev 13989)
+++ branches/xmlbuildsystem/reactos/ntoskrnl/makefile	2005-03-13
03:16:16 UTC (rev 13990)
@@ -0,0 +1,3 @@

+TOP = ..
+DEFAULT = ntoskrnl
+include $(TOP)/proxy.mak
\ No newline at end of file
  _____  

Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp
---
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp	2005-03-13 01:54:53 UTC (rev 13989)
+++
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp	2005-03-13 03:16:16 UTC (rev 13990)
@@ -1307,7 +1307,9 @@

 MingwModuleHandler::GetDefaultDependencies ( const Module& module )
const
 {
 	/* Avoid circular dependency */
-	if ( module.type == BuildTool || module.name == "zlib" )
+	if ( module.type == BuildTool
+		|| module.name == "zlib"
+		|| module.name == "hostzlib" )
 		return "$(ROS_INTERMEDIATE)." SSEP "tools
$(ROS_INTERMEDIATE)." SSEP "lib" SSEP "zlib";
 	else
 		return "init";
  _____  

Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak
--- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak
2005-03-13 01:54:53 UTC (rev 13989)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak
2005-03-13 03:16:16 UTC (rev 13990)
@@ -84,6 +84,9 @@

 
 RBUILD_HOST_LFLAGS = -g
 
+.PHONY: rbuild
+rbuild: $(RBUILD_TARGET)
+
 $(RBUILD_TARGET): $(RBUILD_OBJECTS)
 	$(ECHO_LD)
 	${host_gpp} $(RBUILD_OBJECTS) $(RBUILD_HOST_LFLAGS) -o
$(RBUILD_TARGET)
@@ -104,6 +107,8 @@
 	$(ECHO_CC)
 	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
 
+
+
 .PHONY: rbuild_test
 
 rbuild_test: $(RBUILD_TEST_TARGET)
  _____  

Deleted: branches/xmlbuildsystem/reactos/tools/unicode/Makefile.in
--- branches/xmlbuildsystem/reactos/tools/unicode/Makefile.in
2005-03-13 01:54:53 UTC (rev 13989)
+++ branches/xmlbuildsystem/reactos/tools/unicode/Makefile.in
2005-03-13 03:16:16 UTC (rev 13990)
@@ -1,88 +0,0 @@

-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-LIBRARY   = wine_unicode
-SOVERSION = 1
-VERSCRIPT = $(SRCDIR)/wine_unicode.map
-EXTRADEFS = -D__WINESRC__ -DNO_LIBWINE_PORT -DWINE_UNICODE_API=""
-
-CODEPAGES = \
-	037 \
-	424 \
-	437 \
-	500 \
-	737 \
-	775 \
-	850 \
-	852 \
-	855 \
-	856 \
-	857 \
-	860 \
-	861 \
-	862 \
-	863 \
-	864 \
-	865 \
-	866 \
-	869 \
-	874 \
-	875 \
-	878 \
-	932 \
-	936 \
-	949 \
-	950 \
-	1006 \
-	1026 \
-	1250 \
-	1251 \
-	1252 \
-	1253 \
-	1254 \
-	1255 \
-	1256 \
-	1257 \
-	1258 \
-	10000 \
-	10006 \
-	10007 \
-	10029 \
-	10079 \
-	10081 \
-	20866 \
-	20932 \
-	21866 \
-	28591 \
-	28592 \
-	28593 \
-	28594 \
-	28595 \
-	28596 \
-	28597 \
-	28598 \
-	28599 \
-	28600 \
-	28603 \
-	28604 \
-	28605 \
-	28606
-
-C_SRCS = \
-	casemap.c \
-	collation.c \
-	compose.c \
-	cptable.c \
-	fold.c \
-	mbtowc.c \
-	sortkey.c \
-	string.c \
-	utf8.c \
-	wctomb.c \
-	wctype.c \
-	$(CODEPAGES:%=c_%.c)
-
-@MAKE_LIB_RULES@
-
-### Dependencies:
  _____  

Added: branches/xmlbuildsystem/reactos/tools/unicode/makefile
--- branches/xmlbuildsystem/reactos/tools/unicode/makefile
2005-03-13 01:54:53 UTC (rev 13989)
+++ branches/xmlbuildsystem/reactos/tools/unicode/makefile
2005-03-13 03:16:16 UTC (rev 13990)
@@ -0,0 +1,3 @@

+TOP = ../..
+DEFAULT = unicode
+include $(TOP)/proxy.mak
\ No newline at end of file
  _____  

Deleted: branches/xmlbuildsystem/reactos/tools/wpp/Makefile.in
--- branches/xmlbuildsystem/reactos/tools/wpp/Makefile.in
2005-03-13 01:54:53 UTC (rev 13989)
+++ branches/xmlbuildsystem/reactos/tools/wpp/Makefile.in
2005-03-13 03:16:16 UTC (rev 13990)
@@ -1,37 +0,0 @@

-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-LEXOPT    = -Cf #-w -b
-YACCOPT   = #-v
-MODULE    = libwpp.a
-
-C_SRCS = \
-	preproc.c \
-	wpp.c
-
-EXTRA_SRCS = ppy.y ppl.l
-EXTRA_OBJS = y.tab.o @LEX_OUTPUT_ROOT@.o
-
-all: $(MODULE)
-
-@MAKE_RULES@
-
-$(MODULE): $(OBJS)
-	$(RM) $@
-	$(AR) $@ $(OBJS)
-	$(RANLIB) $@
-
-y.tab.c y.tab.h: ppy.y
-	$(YACC) $(YACCOPT) -ppp -d -t $(SRCDIR)/ppy.y
-
-# hack to allow parallel make
-y.tab.h: y.tab.c
-y.tab.o: y.tab.h
-
-@LEX_OUTPUT_ROOT@.c: ppl.l
-	$(LEX) $(LEXOPT) -d -Ppp -o$@ -8 $(SRCDIR)/ppl.l
-
-@LEX_OUTPUT_ROOT@.o: y.tab.h
-
-### Dependencies: