[royce] 13938: remove obsoleted makefiles and config files, tools/Makefile -> tools/tools.mak, fix bugs in buildno's makefile.
remove obsoleted makefiles and config files, tools/Makefile -> tools/tools.mak, fix bugs in buildno's makefile. Deleted: branches/xmlbuildsystem/reactos/Jamfile Deleted: branches/xmlbuildsystem/reactos/Jamrules Modified: branches/xmlbuildsystem/reactos/Makefile Deleted: branches/xmlbuildsystem/reactos/baseaddress.cfg Deleted: branches/xmlbuildsystem/reactos/config Deleted: branches/xmlbuildsystem/reactos/rules.mak Deleted: branches/xmlbuildsystem/reactos/tools/Makefile Modified: branches/xmlbuildsystem/reactos/tools/buildno/makefile Deleted: branches/xmlbuildsystem/reactos/tools/config.mk Deleted: branches/xmlbuildsystem/reactos/tools/depend.mk Deleted: branches/xmlbuildsystem/reactos/tools/helper.mk Added: branches/xmlbuildsystem/reactos/tools/tools.mak _____
Deleted: branches/xmlbuildsystem/reactos/Jamfile --- branches/xmlbuildsystem/reactos/Jamfile 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/Jamfile 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,5 +0,0 @@
-# Main jamfile for ReactOS - -SubDir ROS_TOP ; - -SubInclude ROS_TOP Lib ; _____
Deleted: branches/xmlbuildsystem/reactos/Jamrules --- branches/xmlbuildsystem/reactos/Jamrules 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/Jamrules 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,54 +0,0 @@
-# customization for ReactOS goes here - -# The SharedLibrary and SharedLibraryFromObjects rules were -# borrowed from here: -# http://www.differentpla.net/~roger/devel/jam/tutorial/shared_lib/index.h tml - -SUFSHR = .dll ; -RM = rm ; # rm comes with MinGW, and the default del doesn't work in some cases - -rule SharedLibrary -{ - SharedLibraryFromObjects $(<) : $(>:S=$(SUFOBJ)) ; - Objects $(>) ; -} - -rule SharedLibraryFromObjects -{ - local _s _t ; - - # Add grist to file names - # Add suffix to dll - - _s = [ FGristFiles $(>) ] ; - _t = [ FAppendSuffix $(<) : $(SUFSHR) ] ; - - if $(_t) != $(<) - { - DEPENDS $(<) : $(_t) ; - NOTFILE $(<) ; - } - - # make compiled sources a dependency of target - - DEPENDS exe : $(_t) ; - DEPENDS $(_t) : $(_s) ; - MakeLocate $(_t) : $(LOCATE_TARGET) ; - - Clean clean : $(_t) ; - - Link $(_t) : $(_s) ; -} - -# nasm needs to know the output file first, or it doesn't -# recognize -I :( -actions As -{ - $(AS) -o $(<) $(ASFLAGS) -I$(HDRS) $(>) -} - -AS = nasm ; - -# why isn't DEFINES working? :( -#DEFINES += _M_IX86 ; -CCFLAGS += -D_M_IX86 ; _____
Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-11 23:06:43 UTC (rev 13938) @@ -110,7 +110,7 @@
ERRCODES_H = .$(SEP)include$(SEP)reactos$(SEP)errcodes.h ERRCODES_RC = .$(SEP)lib$(SEP)kernel32$(SEP)errcodes.rc
-include tools/Makefile +include tools/tools.mak -include makefile.auto
PREAUTO := \ _____
Deleted: branches/xmlbuildsystem/reactos/baseaddress.cfg --- branches/xmlbuildsystem/reactos/baseaddress.cfg 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/baseaddress.cfg 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,96 +0,0 @@
-# $Id$ -# -# Please try to keep this up2date. Please clean up -# after yourself. - -# REACTOS - -TARGET_BASE_LIB_DINPUT8 =0x00400000 -TARGET_BASE_LIB_DXDIAGN =0x00400000 -TARGET_BASE_LIB_NOTIFYHOOK =0x08000000 -TARGET_BASE_LIB_SECURE32 =0x10000000 -TARGET_BASE_LIB_DEVENUM =0x35680000 -TARGET_BASE_LIB_DSOUND =0x50000000 -TARGET_BASE_LIB_GLU32 =0x50000000 -TARGET_BASE_LIB_OPENGL32 =0x50000000 -TARGET_BASE_LIB_EXT_SLAYER =0x5C7E0000 -TARGET_BASE_LIB_DINPUT =0x5F580000 -TARGET_BASE_LIB_CPL_TIMEDATE =0x64DA0000 -TARGET_BASE_LIB_CPL_SYSDM =0x64DD0000 -TARGET_BASE_LIB_CPL_NCPL =0x64EA0000 -TARGET_BASE_LIB_CPL_MAIN =0x64F40000 -TARGET_BASE_LIB_CPL_INTL =0x64FB0000 -TARGET_BASE_LIB_CPL_DESK =0x65080000 -TARGET_BASE_LIB_CPL_APPWIZ =0x65100000 -TARGET_BASE_LIB_CPL_ACCESS =0x65180000 -TARGET_BASE_LIB_HID =0x688F0000 -TARGET_BASE_PSX_LIB_PSXDLL =0x68eb0000 -TARGET_BASE_LIB_PSAPI =0x68f70000 -TARGET_BASE_LIB_MSIMG32 =0x69cc0000 -TARGET_BASE_LIB_NETPLWIZ =0x6a240000 -TARGET_BASE_LIB_UNICODE =0x6b200000 -TARGET_BASE_VGA_DISPLAY =0x70000000 -TARGET_BASE_LIB_CARDS =0x701a0000 -TARGET_BASE_LIB_WININET =0x70200000 -TARGET_BASE_LIB_ACLUI =0x71550000 -TARGET_BASE_LIB_SHDOCVW =0x71700000 -TARGET_BASE_LIB_MSWSOCK =0x71a30000 -TARGET_BASE_LIB_WSOCK32 =0x71ab0000 -TARGET_BASE_LIB_ACLEDIT =0x71b70000 -TARGET_BASE_LIB_NETAPI32 =0x71c00000 -TARGET_BASE_LIB_WINFAX =0x722C0000 -TARGET_BASE_LIB_DEVMGR =0x72a90000 -TARGET_BASE_LIB_WINSCARD =0x723D0000 -TARGET_BASE_LIB_COREDLL =0x73d80000 -TARGET_BASE_LIB_LZEXPAND =0x73d80000 -TARGET_BASE_LIB_USERENV =0x74850000 -TARGET_BASE_LIB_SYSSETUP =0x74a30000 -TARGET_BASE_LIB_OLEDLG =0x74d00000 -TARGET_BASE_LIB_SAMLIB =0x750C0000 -TARGET_BASE_LIB_CABINET =0x75120000 -TARGET_BASE_LIB_MSGINA =0x75970000 -TARGET_BASE_LIB_COMMCTRL =0x75e60000 -TARGET_BASE_LIB_IMM32 =0x75e60000 -TARGET_BASE_LIB_RPCRT4 =0x76000000 -TARGET_BASE_LIB_MIDIMAP =0x76600000 -TARGET_BASE_LIB_SHLWAPI =0x76120000 -TARGET_BASE_LIB_COMCTL32 =0x76160000 -TARGET_BASE_LIB_COMDLG32 =0x76200000 -TARGET_BASE_LIB_OLEAUT32 =0x76260000 -TARGET_BASE_LIB_D3D8THK =0x76340000 -TARGET_BASE_LIB_RICHEDIT =0x76340000 -TARGET_BASE_LIB_TWAIN_32 =0x76380000 -TARGET_BASE_LIB_LSASRV =0x76540000 -TARGET_BASE_LIB_MPR =0x76620000 -TARGET_BASE_LIB_ODBC32 =0x76660000 -TARGET_BASE_LIB_SETUPAPI =0x76660000 -TARGET_BASE_LIB_GDIPLUS =0x76a00000 -TARGET_BASE_LIB_IMAGEHLP =0x76c90000 -TARGET_BASE_LIB_FMIFS =0x76df0000 -TARGET_BASE_LIB_SHELL32 =0x77260000 -TARGET_BASE_LIB_IPHLPAPI =0x77300000 -TARGET_BASE_LIB_MSACM =0x77400000 -TARGET_BASE_LIB_MMDRV =0x77500000 -TARGET_BASE_LIB_CRTDLL =0x77630000 -TARGET_BASE_LIB_PACKET =0x77780000 -TARGET_BASE_LIB_W2_32 =0x77780000 -TARGET_BASE_LIB_MSAFD =0x777a0000 -TARGET_BASE_LIB_IPRTPRIO =0x777c0000 -TARGET_BASE_LIB_SNMPAPI =0x777c0000 -TARGET_BASE_LIB_WINMM =0x777c0000 -TARGET_BASE_LIB_WS2HELP =0x777c0000 -TARGET_BASE_LIB_WSHIRDA =0x777c0000 -TARGET_BASE_NET_WSHTCPIP =0x777c0000 -TARGET_BASE_LIB_WINSPOOL =0x77800000 -TARGET_BASE_LIB_OLE32 =0x77a50000 -TARGET_BASE_LIB_OLEPRO32 =0x77a50000 -TARGET_BASE_LIB_VERSION =0x77a90000 -TARGET_BASE_LIB_ADVAPI32 =0x77dc0000 -TARGET_BASE_LIB_USER32 =0x77e60000 -TARGET_BASE_LIB_GDI32 =0x77ed0000 -TARGET_BASE_LIB_DNSAPI =0x77f00000 -TARGET_BASE_LIB_MSVCRT =0x78000000 -TARGET_BASE_LIB_MSVCRT20 =0x78500000 -TARGET_BASE_LIB_EXPAT =0x79000000 -TARGET_BASE_LIB_KERNEL32 =0x7C800000 -TARGET_BASE_LIB_NTDLL =0x7C900000 _____
Deleted: branches/xmlbuildsystem/reactos/config --- branches/xmlbuildsystem/reactos/config 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/config 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,54 +0,0 @@
-# -# Architecture to build for -# -# Specify one of: i386 -# Possible values in the future: alpha,i386,m68k,mips,powerpc -ARCH := i386 - - -# -# Which cpu should reactos optimize for -# example : i486, i586, pentium, pentium2, pentium3, pentium4 -# athlon-xp, athlon-mp, k6-2, -# -# see gcc manual for more cpu names and which cpus it can -# be optimized for. -# - -OARCH := i486 - -# -# Whether to compile in the kernel debugger -# -KDBG := 0 - -# -# Whether to compile for debugging -# -DBG := 0 - -# -# Whether to compile with optimizations -# -OPTIMIZED := 0 - -# -# Whether to compile a multiprocessor or single processor version -# -CONFIG_SMP := 0 - -# -# Whether to compile for ACPI compliant systems -# -ACPI := 0 - -# -# whether to use a 3GB User, 1GB Kernel memory map -# -3GB := 0 - -# -# Which version of NDIS do we support up to? -# -#NDISVERSION=NDIS50 - _____
Deleted: branches/xmlbuildsystem/reactos/rules.mak --- branches/xmlbuildsystem/reactos/rules.mak 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/rules.mak 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,211 +0,0 @@
-# Default to half-verbose mode -ifeq ($(VERBOSE),no) - Q = @ - HALFVERBOSEECHO = @: - # Do not print "Entering directory ..." - export MAKEFLAGS += --no-print-directory - # Be silent - export MAKEFLAGS += --silent -else -ifeq ($(VERBOSE),yes) - Q = - HALFVERBOSEECHO = @: -else - Q = @ - # the following is a hack to get the target name for wine dlls - # it's disabled because it produces warnings about overriden rules for author.c - #ifeq ($(TARGET_TYPE),winedll) - # export TOOLS_PATH = $(PATH_TO_TOP)/tools - # -include Makefile.ros - #endif - ifeq ($(TARGET_NAME),) - HALFVERBOSEECHO = @echo - else - HALFVERBOSEECHO = @echo $(TARGET_NAME): - endif - # Do not print "Entering directory ..." - export MAKEFLAGS += --no-print-directory - # Be silent - export MAKEFLAGS += --silent -endif -endif - -export MAKE := @$(MAKE) - -ifeq ($(VERBOSE),no) -endif - -# Windows is default host environment -ifeq ($(HOST),) -export HOST = mingw32-windows -endif - -# Default to building map files which includes source and asm code -# Other options are: yes -ifeq ($(BUILD_MAP),) -export BUILD_MAP = full -endif - -# Default to dumping .sym files out of .nostrip files -ifeq ($(BUILD_SYM),) -export BUILD_SYM = yes -endif - -# Default to minimal dependencies, making components not -# depend on all import libraries -ifeq ($(MINIMALDEPENDENCIES),) -export MINIMALDEPENDENCIES = yes -endif - -# Default to no PCH support -ifeq ($(ROS_USE_PCH),) -export ROS_USE_PCH = no -endif - -# uncomment if you use bochs and it displays only 30 rows -# BOCHS_30ROWS = yes - -# -# Choose various options -# -ifeq ($(HOST),mingw32-linux) -export NASM_FORMAT = win32 -export PREFIX = mingw32- -export EXE_POSTFIX := -export EXE_PREFIX := ./ -export DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as -# -# Do not change NASM_CMD to NASM because older versions of -# nasm doesn't like an environment variable NASM -# -export NASM_CMD = nasm -export DOSCLI = -export FLOPPY_DIR = /mnt/floppy -export SEP := / -export PIPE := -endif - -ifeq ($(HOST),mingw32-windows) -export NASM_FORMAT = win32 -export PREFIX = -export EXE_PREFIX := -export EXE_POSTFIX := .exe -export DLLTOOL = $(Q)$(PREFIX)dlltool --as=$(PREFIX)as -# -# Do not change NASM_CMD to NASM because older versions of -# nasm doesn't like an environment variable NASM -# -export NASM_CMD = $(Q)nasmw -export DOSCLI = yes -export FLOPPY_DIR = A: -export SEP := $(EMPTY_VAR) -export PIPE := -pipe -endif - -# TOPDIR is used by make bootcd but not defined anywhere. Usurp pointed out -# that it has the same meaning as PATH_TO_TOP. -export TOPDIR = $(PATH_TO_TOP) - -# Directory to build a bootable CD image in -export BOOTCD_DIR=$(TOPDIR)/../bootcd/disk -export LIVECD_DIR=$(TOPDIR)/../livecd/disk - -ifeq ($(LIVECD_INSTALL),yes) -export INSTALL_DIR=$(LIVECD_DIR)/reactos -else -# Use environment var ROS_INSTALL to override default install dir -ifeq ($(ROS_INSTALL),) -ifeq ($(HOST),mingw32-windows) -export INSTALL_DIR = C:/reactos -else -export INSTALL_DIR = $(PATH_TO_TOP)/reactos -endif -else -export INSTALL_DIR = $(ROS_INSTALL) -endif -endif - - -export CC = $(Q)$(PREFIX)gcc -export CXX = $(Q)$(PREFIX)g++ -export HOST_CC = $(Q)gcc -export HOST_CXX = $(Q)g++ -export HOST_AR = $(Q)ar -export HOST_NM = $(Q)nm -export LD = $(Q)$(PREFIX)ld -export NM = $(Q)$(PREFIX)nm -export OBJCOPY = $(Q)$(PREFIX)objcopy -export STRIP = $(Q)$(PREFIX)strip -export AS = $(Q)$(PREFIX)gcc -c -x assembler-with-cpp -export CPP = $(Q)$(PREFIX)cpp -export AR = $(Q)$(PREFIX)ar -export RC = $(Q)$(PREFIX)windres -export WRC = $(Q)$(WINE_TOP)/tools/wrc/wrc -export OBJCOPY = $(Q)$(PREFIX)objcopy -export OBJDUMP =$(Q)$(PREFIX)objdump -export TOOLS_PATH = $(PATH_TO_TOP)/tools -export W32API_PATH = $(PATH_TO_TOP)/w32api -export CP = $(Q)$(TOOLS_PATH)/rcopy -export RM = $(Q)$(TOOLS_PATH)/rdel -export RLINE = $(Q)$(TOOLS_PATH)/rline -export RMDIR = $(Q)$(TOOLS_PATH)/rrmdir -export RMKDIR = $(Q)$(TOOLS_PATH)/rmkdir -export RSYM = $(Q)$(TOOLS_PATH)/rsym -export RTOUCH = $(Q)$(TOOLS_PATH)/rtouch -export REGTESTS = $(Q)$(TOOLS_PATH)/regtests -export MC = $(Q)$(TOOLS_PATH)/wmc/wmc -export CABMAN = $(Q)$(TOOLS_PATH)/cabman/cabman -export WINEBUILD = $(Q)$(TOOLS_PATH)/winebuild/winebuild -export WINE2ROS = $(Q)$(TOOLS_PATH)/wine2ros/wine2ros -export MKHIVE = $(Q)$(TOOLS_PATH)/mkhive/mkhive -export CDMAKE = $(Q)$(TOOLS_PATH)/cdmake/cdmake -export BIN2RES = $(Q)$(TOOLS_PATH)/bin2res/bin2res -export XSLTPROC = $(Q)xsltproc -export MS2PS = $(Q)$(TOOLS_PATH)/ms2ps/ms2ps -export WRC = $(Q)$(TOOLS_PATH)/wrc/wrc -export WIDL = $(Q)$(TOOLS_PATH)/widl/widl - -export STD_CFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -pipe -march=$(OARCH) -D_M_IX86 -export STD_CPPFLAGS = $(STD_CFLAGS) -# Check for 3GB -ifeq ($(3GB), 1) -export STD_ASFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -D__ASM__ -D_M_IX86 -D__3GB__ -else -export STD_ASFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -D__ASM__ -D_M_IX86 -endif -export STD_RCFLAGS = --include-dir $(PATH_TO_TOP)/include --include-dir $(W32API_PATH)/include -export STD_NFLAGS = -f win32 - -# Developer Kits -export DK_PATH=$(PATH_TO_TOP)/dk -# Native and kernel mode -export DDK_PATH=$(DK_PATH)/nkm -export DDK_PATH_LIB=$(DDK_PATH)/lib -export DDK_PATH_INC=$(PATH_TO_TOP)/include -# Win32 -export SDK_PATH=$(DK_PATH)/w32 -export SDK_PATH_LIB=$(SDK_PATH)/lib -export SDK_PATH_INC=$(PATH_TO_TOP)/include -# POSIX+ -export XDK_PATH=$(DK_PATH)/psx -export XDK_PATH_LIB=$(XDK_PATH)/lib -export XDK_PATH_INC=$(XDK_PATH)/include - -# Wine Integration -export WINE_PATH=$(PATH_TO_TOP)/../wine -export WINE_PATH_LIB=$(WINE_PATH)/lib -export WINE_PATH_INC=$(WINE_PATH)/include - -# Posix+ Integration -export POSIX_PATH=$(PATH_TO_TOP)/../posix -export POSIX_PATH_LIB=$(POSIX_PATH)/lib -export POSIX_PATH_INC=$(POSIX_PATH)/include - -# OS/2 Integration -export OS2_PATH=$(PATH_TO_TOP)/../os2 -export OS2_PATH_LIB=$(OS2_PATH)/lib -export OS2_PATH_INC=$(OS2_PATH)/include - -# Other systems integration -export REGTESTS_PATH=$(PATH_TO_TOP)/regtests -export REGTESTS_PATH_INC=$(PATH_TO_TOP)/regtests/shared _____
Deleted: branches/xmlbuildsystem/reactos/tools/Makefile --- branches/xmlbuildsystem/reactos/tools/Makefile 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/tools/Makefile 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,65 +0,0 @@
-RMKDIR_BASE = tools - -RMKDIR_TARGET = \ - $(ROS_INTERMEDIATE)$(RMKDIR_BASE)$(SEP)rmkdir$(EXEPOSTFIX) - -RMKDIR_SOURCES = \ - $(RMKDIR_BASE)$(SEP)rmkdir.c - -RMKDIR_OBJECTS = \ - $(RMKDIR_SOURCES:.c=.o) - -RMKDIR_HOST_CFLAGS = -g -Werror -Wall - -RMKDIR_HOST_LFLAGS = -g - -$(RMKDIR_TARGET): $(RMKDIR_OBJECTS) - $(ECHO_LD) - ${host_gcc} $(RMKDIR_OBJECTS) $(RMKDIR_HOST_LFLAGS) -o $(RMKDIR_TARGET) - -$(RMKDIR_OBJECTS): %.o : %.c - $(ECHO_CC) - ${host_gcc} $(RMKDIR_HOST_CFLAGS) -c $< -o $@ - -.PHONY: rmkdir_clean -rmkdir_clean: - -@$(rm) $(RMKDIR_TARGET) $(RMKDIR_OBJECTS) 2>$(NUL) -clean: rmkdir_clean - - -RSYM_BASE = tools - -RSYM_TARGET = \ - $(ROS_INTERMEDIATE)$(RSYM_BASE)$(SEP)rsym$(EXEPOSTFIX) - -RSYM_SOURCES = \ - $(RSYM_BASE)$(SEP)rsym.c - -RSYM_OBJECTS = \ - $(RSYM_SOURCES:.c=.o) - -RSYM_HOST_CFLAGS = -g -Werror -Wall - -RSYM_HOST_LFLAGS = -g - -$(RSYM_TARGET): $(RSYM_OBJECTS) - $(ECHO_LD) - ${host_gcc} $(RSYM_OBJECTS) $(RSYM_HOST_LFLAGS) -o $(RSYM_TARGET) - -$(RSYM_OBJECTS): %.o : %.c - $(ECHO_CC) - ${host_gcc} $(RSYM_HOST_CFLAGS) -c $< -o $@ - -.PHONY: rsym_clean -rsym_clean: - -@$(rm) $(RSYM_TARGET) $(RSYM_OBJECTS) 2>$(NUL) -clean: rsym_clean - -include tools/buildno/makefile -include tools/cdmake/makefile -include tools/nci/makefile -include tools/rbuild/makefile -include tools/unicode/makefile -include tools/wmc/makefile -include tools/wpp/makefile -include tools/wrc/makefile _____
Modified: branches/xmlbuildsystem/reactos/tools/buildno/makefile --- branches/xmlbuildsystem/reactos/tools/buildno/makefile 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/tools/buildno/makefile 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,7 +1,7 @@
BUILDNO_BASE = tools$(SEP)buildno
BUILDNO_TARGET = \ - $(ROS_INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno$(EXEPOSTFIX) + $(EXEPREFIX)$(BUILDNO_BASE)$(SEP)buildno$(EXEPOSTFIX)
BUILDNO_SOURCES = \ $(BUILDNO_BASE)$(SEP)buildno.cpp \ @@ -31,5 +31,8 @@ # BUILDNO_H is defined from the top-level makefile now... #BUILDNO_H = .$(SEP)include$(SEP)reactos$(SEP)buildno.h
+.PHONY: buildno_h +buildno_h: $(BUILDNO_H) + $(BUILDNO_H): $(BUILDNO_TARGET) - $(EXEPREFIX)$(BUILDNO_TARGET) $(BUILDNO_H) + $(BUILDNO_TARGET) $(BUILDNO_H) _____
Deleted: branches/xmlbuildsystem/reactos/tools/config.mk --- branches/xmlbuildsystem/reactos/tools/config.mk 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/tools/config.mk 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,33 +0,0 @@
-# Global configuration - -# -# Include details of the OS configuration -# -include $(PATH_TO_TOP)/config - -CONFIG := - -ifeq ($(DBG), 1) -CONFIG += DBG -endif - -ifeq ($(KDBG), 1) -CONFIG += KDBG -endif - -ifeq ($(CONFIG_SMP), 1) -CONFIG += CONFIG_SMP -endif - -ifeq ($(ACPI), 1) -CONFIG += ACPI -endif - -$(PATH_TO_TOP)/tools/mkconfig$(EXE_POSTFIX): $(PATH_TO_TOP)/tools/mkconfig.c - @$(HOST_CC) -g -o $(PATH_TO_TOP)/tools/mkconfig$(EXE_POSTFIX) $(PATH_TO_TOP)/tools/mkconfig.c - -$(PATH_TO_TOP)/config: $(PATH_TO_TOP)/tools/mkconfig$(EXE_POSTFIX) - @$(PATH_TO_TOP)/tools/mkconfig$(EXE_POSTFIX) $(PATH_TO_TOP)/include/roscfg.h$(CONFIG) - -$(PATH_TO_TOP)/include/roscfg.h: $(PATH_TO_TOP)/config - @$(PATH_TO_TOP)/tools/mkconfig$(EXE_POSTFIX) $(PATH_TO_TOP)/include/roscfg.h$(CONFIG) _____
Deleted: branches/xmlbuildsystem/reactos/tools/depend.mk --- branches/xmlbuildsystem/reactos/tools/depend.mk 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/tools/depend.mk 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,65 +0,0 @@
-# Automatic dependancy tracking -# Define $DEP_OBJECTS before this file is included -# $DEP_OBJECTS contain a list of object files that are checked for dependancies - -ifneq ($(DEPENDENCIES),no) -ifneq ($(MAKECMDGOALS),implib) - -DEP_FILTERED := $(filter-out $(DEP_EXCLUDE_FILTER), $(DEP_OBJECTS:.o=.d)) - -PCH := - -ifeq ($(ROS_USE_PCH),yes) -ifneq ($(TARGET_PCH),) - -PCH = $(TARGET_PCH).gch - -DEP_FILTERED := $(DEP_FILTERED) $(TARGET_PCH:.h=.d) - -endif # TARGET_PCH -endif - -DEP_FILES := $(join $(dir $(DEP_FILTERED)), $(addprefix ., $(notdir $(DEP_FILTERED)))) - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(DEP_FILES),) --include $(DEP_FILES) -endif -endif - -ifeq ($(SEP),) -DEPENDS_PATH := $(subst /,,$(PATH_TO_TOP))\tools -else -DEPENDS_PATH := $(PATH_TO_TOP)/tools -endif - -.%.d: %.c $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES) - $(HALFVERBOSEECHO) [DEPENDS] $@ - $(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@ - -.%.d: %.cc $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES) - $(HALFVERBOSEECHO) [DEPENDS] $@ - $(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@ - -.%.d: %.cpp $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES) - $(HALFVERBOSEECHO) [DEPENDS] $@ - $(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@ - -.%.d: %.S $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES) - $(HALFVERBOSEECHO) [DEPENDS] $@ - $(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@ - -.%.d: %.s $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES) - $(HALFVERBOSEECHO) [DEPENDS] $@ - $(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@ - -.%.d: %.asm $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES) - $(HALFVERBOSEECHO) [DEPENDS] $@ - $(NASM_CMD) $(NFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@ - -.%.d: %.h $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES) - $(HALFVERBOSEECHO) [DEPENDS] $@ - $(PCH_CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@ - -endif -endif _____
Deleted: branches/xmlbuildsystem/reactos/tools/helper.mk --- branches/xmlbuildsystem/reactos/tools/helper.mk 2005-03-11 21:13:11 UTC (rev 13937) +++ branches/xmlbuildsystem/reactos/tools/helper.mk 2005-03-11 23:06:43 UTC (rev 13938) @@ -1,1160 +0,0 @@
-# $Id$ -# -# Helper makefile for ReactOS modules -# Variables this makefile accepts: -# $TARGET_TYPE = Type of target: -# program = User mode program -# proglib = Executable program that have exported functions -# dynlink = Dynamic Link Library (DLL) -# library = Library that will be linked with other code -# driver = Kernel mode driver -# export_driver = Kernel mode driver that have exported functions -# driver_library = Import library for a driver -# kmlibrary = Static kernel-mode library -# host_library = Static library for use in the build env -# hal = Hardware Abstraction Layer -# bootpgm = Boot program -# miniport = Kernel mode driver that does not link with ntoskrnl.exe or hal.dll -# gdi_driver = Kernel mode graphics driver that link with win32k.sys -# subsystem = Kernel subsystem -# kmdll = Kernel mode DLL -# winedll = DLL imported from wine -# kernel = ReactOS kernel -# test = ReactOS test -# $TARGET_APPTYPE = Application type (windows,native,console). -# Required only for TARGET_TYPEs program and proglib -# $TARGET_NAME = Base name of output file and .rc, .def, and .edf files -# $TARGET_OBJECTS = Object files that compose the module -# $TARGET_CPPAPP = C++ application (no,yes) (optional) -# $TARGET_HEADERS = Header files that the object files depend on (optional) -# $TARGET_DEFNAME = Base name of .def and .edf files (optional) -# $TARGET_BASENAME = Base name of output file (overrides $TARGET_NAME if it exists) (optional) -# $TARGET_EXTENSION = Extension of the output file (optional) -# $TARGET_DDKLIBS = DDK libraries that are to be imported by the module (optional) -# $TARGET_SDKLIBS = SDK libraries that are to be imported by the module (optional) -# $TARGET_LIBS = Other libraries that are to be imported by the module (optional) -# $TARGET_GCCLIBS = GCC libraries imported with -l (optional) -# $TARGET_LFLAGS = GCC flags when linking (optional) -# $TARGET_CFLAGS = GCC flags (optional) -# $TARGET_CPPFLAGS = G++ flags (optional) -# $TARGET_ASFLAGS = GCC assembler flags (optional) -# $TARGET_NFLAGS = NASM flags (optional) -# $TARGET_RCFLAGS = Windres flags (optional) -# $TARGET_CLEAN = Files that are part of the clean rule (optional) -# $TARGET_PATH = Relative path for *.def, *.edf, and *.rc (optional) -# $TARGET_BASE = Default base address (optional) -# $TARGET_ENTRY = Entry point (optional) -# $TARGET_NORC = Do not include standard resource file (no,yes) (optional) -# $TARGET_LIBPATH = Destination path for static libraries (optional) -# $TARGET_IMPLIBPATH = Destination path for import libraries (optional) -# $TARGET_INSTALLDIR = Destination path when installed (optional) -# $TARGET_PCH = Filename of header to use to generate a PCH if supported by the compiler (optional) -# $TARGET_BOOTSTRAP = Whether this file is needed to bootstrap the installation (no,yes) (optional) -# $TARGET_BOOTSTRAP_NAME = Name on the installation medium (optional) -# $TARGET_REGTESTS = This module has regression tests (no,yes) (optional) -# $TARGET_WINETESTS = This module Wine regression tests (no,yes) (optional) -# $TARGET_INSTALL = Install the file (no,yes) (optional) -# $SUBDIRS = Subdirs in which to run make (optional) - -include $(PATH_TO_TOP)/config -include $(PATH_TO_TOP)/baseaddress.cfg - -ifeq ($(TARGET_PATH),) -TARGET_PATH := . -endif - -ifeq ($(ARCH),i386) - MK_ARCH_ID := _M_IX86 -endif - -ifeq ($(ARCH),alpha) - MK_ARCH_ID := _M_ALPHA -endif - -ifeq ($(ARCH),mips) - MK_ARCH_ID := _M_MIPS -endif - -ifeq ($(ARCH),powerpc) - MK_ARCH_ID := _M_PPC -endif - -# unknown architecture -ifeq ($(MK_ARCH_ID),) - MK_ARCH_ID := _M_UNKNOWN -endif - -# -# VARIABLES IN USE BY VARIOUS TARGETS -# -# MK_BOOTCDDIR = Directory on the ReactOS ISO CD in which to place the file (subdir of reactos/) -# MK_CFLAGS = C compiler command-line flags for this target -# MK_CPPFLAGS = C++ compiler command-line flags for this target -# MK_DDKLIBS = Import libraries from the ReactOS DDK to link with -# MK_DEFENTRY = Module entry point: -# _WinMain@16 for windows EXE files that are export libraries -# _DriverEntry@8 for .SYS files -# _DllMain@12 for .DLL files -# _DrvEnableDriver@12 for GDI drivers -# _WinMainCRTStartup for Win32 EXE files -# _NtProcessStartup@4 for Native EXE files -# _mainCRTStartup for Console EXE files -# MK_DEFEXT = Extension to give compiled modules (.EXE, .DLL, .SYS, .a) -# MK_DISTDIR = (unused?) -# MK_EXETYPE = Compiler option packages based on type of PE file (exe, dll) -# MK_IMPLIB = Whether or not to generate a DLL import stub library (yes, no) -# MK_IMPLIB_EXT = Extension to give import libraries (.a always) -# MK_IMPLIBDEFPATH = Default place to put the import stub library when built -# MK_IMPLIBONLY = Whether the target is only an import library (yes, no; used only by generic hal) -# MK_INSTALLDIR = Where "make install" should put the target, relative to reactos/ -# MK_MODE = Mode the target's code is intended to run in -# user - User-mode compiler settings -# kernel - Kernel-mode compiler settings -# static - Static library compiler settings -# MK_RCFLAGS = Flags to add to resource compiler command line -# MK_RES_BASE = Base name of resource files -# MK_SDKLIBS = Default SDK libriaries to link with -# - -ifeq ($(TARGET_TYPE),program) - MK_MODE := user - MK_EXETYPE := exe - MK_DEFEXT := .exe - MK_DEFENTRY := _DEFINE_TARGET_APPTYPE - MK_DDKLIBS := - MK_SDKLIBS := - MK_CFLAGS := -I. - MK_CPPFLAGS := -I. - MK_IMPLIB := no - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := - MK_IMPLIB_EXT := .a - MK_INSTALLDIR := bin - MK_BOOTCDDIR := system32 - MK_DISTDIR := apps - MK_RES_BASE := $(TARGET_NAME) -endif - -ifeq ($(TARGET_TYPE),proglib) - MK_MODE := user - MK_EXETYPE := dll - MK_DEFEXT := .exe - MK_DEFENTRY := _WinMain@16 - MK_DDKLIBS := - MK_SDKLIBS := - MK_CFLAGS := -I. - MK_CPPFLAGS := -I. - MK_IMPLIB := yes - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := $(SDK_PATH_LIB) - MK_IMPLIB_EXT := .a - MK_INSTALLDIR := bin - MK_BOOTCDDIR := system32 - MK_DISTDIR := apps - MK_RES_BASE := $(TARGET_NAME) -endif - -ifeq ($(TARGET_TYPE),dynlink) - MK_MODE := user - MK_EXETYPE := dll - MK_DEFEXT := .dll - MK_DEFENTRY := _DllMain@12 - MK_DDKLIBS := - MK_SDKLIBS := - MK_CFLAGS := -I. - MK_CPPFLAGS := -I. - MK_IMPLIB := yes - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := $(SDK_PATH_LIB) - MK_IMPLIB_EXT := .a - MK_INSTALLDIR := system32 - MK_BOOTCDDIR := system32 - MK_DISTDIR := dlls - MK_RES_BASE := $(TARGET_NAME) -endif - -ifeq ($(TARGET_TYPE),library) - TARGET_NORC := yes - MK_MODE := static - MK_EXETYPE := - MK_DEFEXT := .a - MK_DEFENTRY := - MK_DDKLIBS := - MK_SDKLIBS := - MK_CFLAGS := -I. - MK_CPPFLAGS := -I. - MK_IMPLIB := no - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := - MK_IMPLIB_EXT := - MK_INSTALLDIR := # none - MK_BOOTCDDIR := system32 - MK_DISTDIR := # none - MK_RES_BASE := -endif - -ifeq ($(TARGET_TYPE),kmlibrary) - TARGET_NORC := yes - MK_MODE := static - MK_DEFEXT := .a - MK_CFLAGS := -I. - MK_CPPFLAGS := -I. - MK_IMPLIB := no - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := $(DDK_PATH_LIB) - #MK_IMPLIB_EXT := -endif - -ifeq ($(TARGET_TYPE),driver_library) - MK_MODE := kernel - MK_EXETYPE := dll - MK_DEFEXT := .dll - MK_DEFENTRY := - MK_DDKLIBS := - MK_SDKLIBS := - MK_CFLAGS := -I. - MK_CPPFLAGS := -I. - MK_IMPLIB := no - MK_IMPLIBONLY := yes - MK_IMPLIBDEFPATH := $(DDK_PATH_LIB) - MK_IMPLIB_EXT := .a - MK_INSTALLDIR := $(DDK_PATH_INC) - MK_BOOTCDDIR := . - MK_DISTDIR := # FIXME - MK_RES_BASE := -endif - -ifeq ($(TARGET_TYPE),host_library) - TARGET_NORC := yes - MK_MODE := static - MK_DEFEXT := .a - MK_CFLAGS := - MK_CPPFLAGS := - MK_LIBPATH := . - MK_IMPLIB := no - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := - MK_CC := $(HOST_CC) - MK_AR := $(HOST_AR) -endif - -ifeq ($(TARGET_TYPE),driver) - MK_MODE := kernel - MK_EXETYPE := dll - MK_DEFEXT := .sys - MK_DEFENTRY := _DriverEntry@8 - MK_DDKLIBS := ntoskrnl.a hal.a - MK_SDKLIBS := - MK_CFLAGS := -D__NTDRIVER__ -I. - MK_CPPFLAGS := -D__NTDRIVER__ -I. - MK_IMPLIB := no - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := - MK_IMPLIB_EXT := .a - MK_INSTALLDIR := system32/drivers - MK_BOOTCDDIR := . - MK_DISTDIR := drivers - MK_RES_BASE := $(TARGET_NAME) -endif - -ifeq ($(TARGET_TYPE),export_driver) - MK_MODE := kernel - MK_EXETYPE := dll - MK_DEFEXT := .sys - MK_DEFENTRY := _DriverEntry@8 - MK_DDKLIBS := ntoskrnl.a hal.a - MK_SDKLIBS := - MK_CFLAGS := -D__NTDRIVER__ -I. - MK_CPPFLAGS := -D__NTDRIVER__ -I. - MK_IMPLIB := yes - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := $(DDK_PATH_LIB) - MK_IMPLIB_EXT := .a - MK_INSTALLDIR := system32/drivers - MK_BOOTCDDIR := . - MK_DISTDIR := drivers - MK_RES_BASE := $(TARGET_NAME) -endif - -ifeq ($(TARGET_TYPE),hal) - MK_MODE := kernel - MK_EXETYPE := dll - MK_DEFEXT := .dll - MK_DEFENTRY := _DriverEntry@8 - MK_DDKLIBS := ntoskrnl.a - MK_SDKLIBS := - MK_CFLAGS := -D__NTHAL__ -I. - MK_CPPFLAGS := -D__NTHAL__ -I. - MK_IMPLIB := yes - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := $(DDK_PATH_LIB) - MK_IMPLIB_EXT := .a - MK_INSTALLDIR := system32 - MK_BOOTCDDIR := . - MK_DISTDIR := dlls - MK_RES_BASE := $(TARGET_NAME) - MK_INSTALL_BASENAME := hal - MK_INSTALL_FULLNAME := hal.dll - ifeq ($(TARGET_BOOTSTRAP),yes) - TARGET_BOOTSTRAP_NAME := hal.dll - else - TARGET_BOOTSTRAP_NAME := $(TARGET_NAME)$(MK_DEFEXT) - endif - TARGET_BOOTSTRAP := yes -endif - -ifeq ($(TARGET_TYPE),bootpgm) - MK_MODE := kernel - MK_EXETYPE := exe - MK_DEFEXT := .exe - MK_DEFENTRY := _DriverEntry@8 - MK_DDKLIBS := - MK_SDKLIBS := - MK_CFLAGS := -D__NTDRIVER__ -I. - MK_CPPFLAGS := -D__NTDRIVER__ -I. - MK_IMPLIB := no - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := - MK_IMPLIB_EXT := .a - MK_INSTALLDIR := system32 - MK_BOOTCDDIR := system32 - MK_DISTDIR := # FIXME - MK_RES_BASE := $(TARGET_NAME) -endif - -ifeq ($(TARGET_TYPE),miniport) - MK_MODE := kernel - MK_EXETYPE := dll - MK_DEFEXT := .sys - MK_DEFENTRY := _DriverEntry@8 - MK_DDKLIBS := - MK_SDKLIBS := - MK_CFLAGS := -D__NTDRIVER__ -I. - MK_CPPFLAGS := -D__NTDRIVER__ -I. - MK_IMPLIB := no - MK_IMPLIBONLY := no - MK_IMPLIBDEFPATH := [truncated at 1000 lines; 825 more skipped]
-
royce＠svn.reactos.com