diff --git a/reactos/lib/3rdparty/zlib/zlib.mak b/reactos/lib/3rdparty/zlib/zlib.mak deleted file mode 100755 index 3f88b3127b6..00000000000 --- a/reactos/lib/3rdparty/zlib/zlib.mak +++ /dev/null @@ -1,96 +0,0 @@ -ZLIB_BASE = $(LIB_BASE_)3rdparty$(SEP)zlib -ZLIB_BASE_ = $(ZLIB_BASE)$(SEP) -ZLIB_INT = $(INTERMEDIATE_)$(ZLIB_BASE) -ZLIB_INT_ = $(INTERMEDIATE_)$(ZLIB_BASE)$(SEP) -ZLIB_OUT = $(OUTPUT_)$(ZLIB_BASE) -ZLIB_OUT_ = $(OUTPUT_)$(ZLIB_BASE)$(SEP) - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(ZLIB_OUT): | $(OUTPUT_)$(LIB_BASE) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -ZLIB_HOST_TARGET = \ - $(ZLIB_OUT)$(SEP)zlib.host.a - -ZLIB_HOST_SOURCES = $(addprefix $(ZLIB_BASE_), \ - adler32.c \ - compress.c \ - crc32.c \ - gzio.c \ - uncompr.c \ - deflate.c \ - trees.c \ - zutil.c \ - inflate.c \ - infback.c \ - inftrees.c \ - inffast.c \ - ) - -ZLIB_HOST_OBJECTS = \ - $(addprefix $(INTERMEDIATE_), $(ZLIB_HOST_SOURCES:.c=.host.o)) - -ZLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ - -Wstrict-prototypes -Wmissing-prototypes $(TOOLS_CPPFLAGS) - -$(ZLIB_HOST_TARGET): $(ZLIB_HOST_OBJECTS) | $(ZLIB_OUT) - $(ECHO_AR) - $(host_ar) -r $@ $(ZLIB_HOST_OBJECTS) - -$(ZLIB_INT_)adler32.host.o: $(ZLIB_BASE_)adler32.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)compress.host.o: $(ZLIB_BASE_)compress.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)crc32.host.o: $(ZLIB_BASE_)crc32.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)gzio.host.o: $(ZLIB_BASE_)gzio.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)uncompr.host.o: $(ZLIB_BASE_)uncompr.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)deflate.host.o: $(ZLIB_BASE_)deflate.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)trees.host.o: $(ZLIB_BASE_)trees.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)zutil.host.o: $(ZLIB_BASE_)zutil.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)inflate.host.o: $(ZLIB_BASE_)inflate.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)infback.host.o: $(ZLIB_BASE_)infback.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)inftrees.host.o: $(ZLIB_BASE_)inftrees.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)inffast.host.o: $(ZLIB_BASE_)inffast.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -.PHONY: zlib_host -zlib_host: $(ZLIB_HOST_TARGET) - -.PHONY: zlib_host_clean -zlib_host_clean: - -@$(rm) $(ZLIB_HOST_TARGET) $(ZLIB_HOST_OBJECTS) 2>$(NUL) -clean: zlib_host_clean diff --git a/reactos/lib/3rdparty/zlib/zlib.rbuild b/reactos/lib/3rdparty/zlib/zlib.rbuild index e1947655add..27082adfacb 100644 --- a/reactos/lib/3rdparty/zlib/zlib.rbuild +++ b/reactos/lib/3rdparty/zlib/zlib.rbuild @@ -1,5 +1,6 @@ + . adler32.c @@ -15,3 +16,19 @@ inftrees.c inffast.c + + . + adler32.c + compress.c + crc32.c + gzio.c + uncompr.c + deflate.c + trees.c + zutil.c + inflate.c + infback.c + inftrees.c + inffast.c + + diff --git a/reactos/lib/cmlib/cmlib.mak b/reactos/lib/cmlib/cmlib.mak deleted file mode 100644 index 04834f3559c..00000000000 --- a/reactos/lib/cmlib/cmlib.mak +++ /dev/null @@ -1,71 +0,0 @@ -CMLIB_BASE = $(LIB_BASE_)cmlib -CMLIB_BASE_ = $(CMLIB_BASE)$(SEP) -CMLIB_INT = $(INTERMEDIATE_)$(CMLIB_BASE)_host -CMLIB_INT_ = $(INTERMEDIATE_)$(CMLIB_BASE)_host$(SEP) -CMLIB_OUT = $(OUTPUT_)$(CMLIB_BASE)_host -CMLIB_OUT_ = $(OUTPUT_)$(CMLIB_BASE)_host$(SEP) - -$(CMLIB_INT): | $(LIB_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(CMLIB_OUT): | $(OUTPUT_)$(LIB_BASE) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -CMLIB_HOST_TARGET = \ - $(CMLIB_OUT)$(SEP)cmlib.a - -CMLIB_HOST_SOURCES = $(addprefix $(CMLIB_BASE_), \ - cminit.c \ - hivebin.c \ - hivecell.c \ - hiveinit.c \ - hivesum.c \ - hivewrt.c \ - ) - -CMLIB_HOST_OBJECTS = \ - $(subst $(CMLIB_BASE), $(CMLIB_INT), $(CMLIB_HOST_SOURCES:.c=.o)) - -CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith \ - -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude \ - -DCMLIB_HOST $(HOST_CFLAGS) - -$(CMLIB_HOST_TARGET): $(CMLIB_HOST_OBJECTS) | $(CMLIB_OUT) - $(ECHO_AR) - $(host_ar) -r $@ $(CMLIB_HOST_OBJECTS) - -$(CMLIB_INT_)cminit.o: $(CMLIB_BASE_)cminit.c | $(CMLIB_INT) - $(ECHO_CC) - ${host_gcc} $(CMLIB_HOST_CFLAGS) -c $< -o $@ - -$(CMLIB_INT_)hivebin.o: $(CMLIB_BASE_)hivebin.c | $(CMLIB_INT) - $(ECHO_CC) - ${host_gcc} $(CMLIB_HOST_CFLAGS) -c $< -o $@ - -$(CMLIB_INT_)hivecell.o: $(CMLIB_BASE_)hivecell.c | $(CMLIB_INT) - $(ECHO_CC) - ${host_gcc} $(CMLIB_HOST_CFLAGS) -c $< -o $@ - -$(CMLIB_INT_)hiveinit.o: $(CMLIB_BASE_)hiveinit.c | $(CMLIB_INT) - $(ECHO_CC) - ${host_gcc} $(CMLIB_HOST_CFLAGS) -c $< -o $@ - -$(CMLIB_INT_)hivesum.o: $(CMLIB_BASE_)hivesum.c | $(CMLIB_INT) - $(ECHO_CC) - ${host_gcc} $(CMLIB_HOST_CFLAGS) -c $< -o $@ - -$(CMLIB_INT_)hivewrt.o: $(CMLIB_BASE_)hivewrt.c | $(CMLIB_INT) - $(ECHO_CC) - ${host_gcc} $(CMLIB_HOST_CFLAGS) -c $< -o $@ - -.PHONY: cmlib_host -cmlib_host: $(CMLIB_HOST_TARGET) - -.PHONY: cmlib_host_clean -cmlib_host_clean: - -@$(rm) $(CMLIB_HOST_TARGET) $(CMLIB_HOST_OBJECTS) 2>$(NUL) -clean: cmlib_host_clean diff --git a/reactos/lib/cmlib/cmlib.rbuild b/reactos/lib/cmlib/cmlib.rbuild index 130e8478617..254dc2290d6 100644 --- a/reactos/lib/cmlib/cmlib.rbuild +++ b/reactos/lib/cmlib/cmlib.rbuild @@ -1,5 +1,6 @@ + . @@ -14,3 +15,23 @@ hivesum.c hivewrt.c + + . + include/reactos + include + + + + + -Wwrite-strings + -Wpointer-arith + + cmlib.h + cminit.c + hivebin.c + hivecell.c + hiveinit.c + hivesum.c + hivewrt.c + + diff --git a/reactos/lib/inflib/inflib.rbuild b/reactos/lib/inflib/inflib.rbuild index 8a86f7fbd11..c600e007ca1 100644 --- a/reactos/lib/inflib/inflib.rbuild +++ b/reactos/lib/inflib/inflib.rbuild @@ -1,5 +1,6 @@ + . @@ -11,3 +12,22 @@ infrosget.c infrosput.c + + . + include/reactos + + -Wpointer-arith + -Wconversion + -Wstrict-prototypes + -Wmissing-prototypes + + include + inflib.h + infcore.c + infget.c + infput.c + infhostgen.c + infhostget.c + infhostput.c + + diff --git a/reactos/lib/lib.mak b/reactos/lib/lib.mak index db0fb9aa533..9b9b59f84e9 100644 --- a/reactos/lib/lib.mak +++ b/reactos/lib/lib.mak @@ -2,8 +2,6 @@ LIB_BASE = lib LIB_BASE_ = $(LIB_BASE)$(SEP) include lib/inflib/inflib.mak -include lib/3rdparty/zlib/zlib.mak -include lib/cmlib/cmlib.mak ifeq ($(ARCH),powerpc) include lib/ppcmmu/ppcmmu.mak endif diff --git a/reactos/tools/cabman/cabman.mak b/reactos/tools/cabman/cabman.mak deleted file mode 100755 index daa9e9b4d04..00000000000 --- a/reactos/tools/cabman/cabman.mak +++ /dev/null @@ -1,68 +0,0 @@ -CABMAN_BASE = $(TOOLS_BASE_)cabman -CABMAN_BASE_ = $(CABMAN_BASE)$(SEP) -CABMAN_INT = $(INTERMEDIATE_)$(CABMAN_BASE) -CABMAN_INT_ = $(CABMAN_INT)$(SEP) -CABMAN_OUT = $(OUTPUT_)$(CABMAN_BASE) -CABMAN_OUT_ = $(CABMAN_OUT)$(SEP) - -$(CABMAN_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(CABMAN_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -CABMAN_TARGET = \ - $(CABMAN_OUT_)cabman$(EXEPOSTFIX) - -CABMAN_SOURCES = $(addprefix $(CABMAN_BASE_), \ - cabinet.cxx \ - dfp.cxx \ - main.cxx \ - mszip.cxx \ - raw.cxx \ - ) - -CABMAN_OBJECTS = \ - $(addprefix $(INTERMEDIATE_), $(CABMAN_SOURCES:.cxx=.o)) - -CABMAN_HOST_CXXFLAGS = -Iinclude -Iinclude/reactos -Ilib/3rdparty/zlib $(TOOLS_CPPFLAGS) - -CABMAN_HOST_LIBS = $(ZLIB_HOST_TARGET) - -CABMAN_HOST_LFLAGS = $(TOOLS_LFLAGS) $(CABMAN_HOST_LIBS) - -.PHONY: cabman -cabman: $(CABMAN_TARGET) - -$(CABMAN_TARGET): $(CABMAN_OBJECTS) $(CABMAN_HOST_LIBS) | $(CABMAN_OUT) - $(ECHO_LD) - ${host_gpp} $(CABMAN_OBJECTS) $(CABMAN_HOST_LFLAGS) -o $@ - -$(CABMAN_INT_)cabinet.o: $(CABMAN_BASE_)cabinet.cxx | $(CABMAN_INT) - $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CXXFLAGS) -c $< -o $@ - -$(CABMAN_INT_)dfp.o: $(CABMAN_BASE_)dfp.cxx | $(CABMAN_INT) - $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CXXFLAGS) -c $< -o $@ - -$(CABMAN_INT_)main.o: $(CABMAN_BASE_)main.cxx | $(CABMAN_INT) - $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CXXFLAGS) -c $< -o $@ - -$(CABMAN_INT_)mszip.o: $(CABMAN_BASE_)mszip.cxx | $(CABMAN_INT) - $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CXXFLAGS) -c $< -o $@ - -$(CABMAN_INT_)raw.o: $(CABMAN_BASE_)raw.cxx | $(CABMAN_INT) - $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CXXFLAGS) -c $< -o $@ - -.PHONY: cabman_clean -cabman_clean: - -@$(rm) $(CABMAN_TARGET) $(CABMAN_OBJECTS) 2>$(NUL) -clean: cabman_clean diff --git a/reactos/tools/cabman/cabman.rbuild b/reactos/tools/cabman/cabman.rbuild new file mode 100644 index 00000000000..ef058bbbb92 --- /dev/null +++ b/reactos/tools/cabman/cabman.rbuild @@ -0,0 +1,11 @@ + + + + . + zlibhost + cabinet.cxx + dfp.cxx + main.cxx + mszip.cxx + raw.cxx + diff --git a/reactos/tools/cabman/cabman.sln b/reactos/tools/cabman/cabman.sln deleted file mode 100644 index 1ebda2ad43c..00000000000 --- a/reactos/tools/cabman/cabman.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C++ Express 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cabman", "cabman.vcproj", "{3A9CBD2C-BD87-4838-917E-F85C49BC3617}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3A9CBD2C-BD87-4838-917E-F85C49BC3617}.Debug|Win32.ActiveCfg = Debug|Win32 - {3A9CBD2C-BD87-4838-917E-F85C49BC3617}.Debug|Win32.Build.0 = Debug|Win32 - {3A9CBD2C-BD87-4838-917E-F85C49BC3617}.Release|Win32.ActiveCfg = Release|Win32 - {3A9CBD2C-BD87-4838-917E-F85C49BC3617}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/reactos/tools/cabman/cabman.vcproj b/reactos/tools/cabman/cabman.vcproj deleted file mode 100644 index 92218e3da6b..00000000000 --- a/reactos/tools/cabman/cabman.vcproj +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/reactos/tools/mkhive/mkhive.mak b/reactos/tools/mkhive/mkhive.mak deleted file mode 100644 index e31164dc328..00000000000 --- a/reactos/tools/mkhive/mkhive.mak +++ /dev/null @@ -1,72 +0,0 @@ -MKHIVE_BASE = $(TOOLS_BASE_)mkhive -MKHIVE_BASE_ = $(MKHIVE_BASE)$(SEP) -MKHIVE_INT = $(INTERMEDIATE_)$(MKHIVE_BASE) -MKHIVE_INT_ = $(MKHIVE_INT)$(SEP) -MKHIVE_OUT = $(OUTPUT_)$(MKHIVE_BASE) -MKHIVE_OUT_ = $(MKHIVE_OUT)$(SEP) - -$(MKHIVE_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(MKHIVE_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -MKHIVE_TARGET = \ - $(MKHIVE_OUT_)mkhive$(EXEPOSTFIX) - -MKHIVE_SOURCES = $(addprefix $(MKHIVE_BASE_), \ - binhive.c \ - cmi.c \ - mkhive.c \ - reginf.c \ - registry.c \ - rtl.c \ - ) - -MKHIVE_OBJECTS = \ - $(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o)) - -MKHIVE_HOST_CFLAGS = -fshort-wchar -I$(INFLIB_BASE) -I$(CMLIB_BASE) \ - -DMKHIVE_HOST -Iinclude/reactos -Iinclude -g3 $(HOST_CFLAGS) - -MKHIVE_HOST_LFLAGS = $(TOOLS_LFLAGS) -g3 - -.PHONY: mkhive -mkhive: $(MKHIVE_TARGET) - -$(MKHIVE_TARGET): $(MKHIVE_OBJECTS) $(INFLIB_HOST_OBJECTS) $(CMLIB_HOST_OBJECTS) | $(MKHIVE_OUT) - $(ECHO_LD) - ${host_gcc} $(MKHIVE_OBJECTS) $(INFLIB_HOST_OBJECTS) $(CMLIB_HOST_OBJECTS) $(MKHIVE_HOST_LFLAGS) -o $@ - -$(MKHIVE_INT_)binhive.o: $(MKHIVE_BASE_)binhive.c | $(MKHIVE_INT) - $(ECHO_CC) - ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ - -$(MKHIVE_INT_)cmi.o: $(MKHIVE_BASE_)cmi.c | $(MKHIVE_INT) - $(ECHO_CC) - ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ - -$(MKHIVE_INT_)mkhive.o: $(MKHIVE_BASE_)mkhive.c | $(MKHIVE_INT) - $(ECHO_CC) - ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ - -$(MKHIVE_INT_)reginf.o: $(MKHIVE_BASE_)reginf.c | $(MKHIVE_INT) - $(ECHO_CC) - ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ - -$(MKHIVE_INT_)registry.o: $(MKHIVE_BASE_)registry.c | $(MKHIVE_INT) - $(ECHO_CC) - ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ - -$(MKHIVE_INT_)rtl.o: $(MKHIVE_BASE_)rtl.c | $(MKHIVE_INT) - $(ECHO_CC) - ${host_gcc} $(MKHIVE_HOST_CFLAGS) -Ilib/rtl -c $< -o $@ - -.PHONY: mkhive_clean -mkhive_clean: - -@$(rm) $(MKHIVE_TARGET) $(MKHIVE_OBJECTS) 2>$(NUL) -clean: mkhive_clean diff --git a/reactos/tools/mkhive/mkhive.rbuild b/reactos/tools/mkhive/mkhive.rbuild new file mode 100644 index 00000000000..e3d750654f6 --- /dev/null +++ b/reactos/tools/mkhive/mkhive.rbuild @@ -0,0 +1,20 @@ + + + + include + include/reactos + . + . + . + . + + -fshort-wchar + inflibhost + cmlibhost + binhive.c + cmi.c + mkhive.c + reginf.c + registry.c + rtl.c + diff --git a/reactos/tools/rgenstat/rgenstat.mak b/reactos/tools/rgenstat/rgenstat.mak deleted file mode 100644 index 99a4ba47b71..00000000000 --- a/reactos/tools/rgenstat/rgenstat.mak +++ /dev/null @@ -1,51 +0,0 @@ -RGENSTAT_BASE = $(TOOLS_BASE_)rgenstat -RGENSTAT_BASE_ = $(RGENSTAT_BASE)$(SEP) -RGENSTAT_INT = $(INTERMEDIATE_)$(RGENSTAT_BASE) -RGENSTAT_INT_ = $(RGENSTAT_INT)$(SEP) -RGENSTAT_OUT = $(OUTPUT_)$(RGENSTAT_BASE) -RGENSTAT_OUT_ = $(RGENSTAT_OUT)$(SEP) - -$(RGENSTAT_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(RGENSTAT_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -RGENSTAT_TARGET = \ - $(RGENSTAT_OUT_)rgenstat$(EXEPOSTFIX) - -RGENSTAT_SOURCES = $(addprefix $(RGENSTAT_BASE_), \ - rgenstat.c \ - llmosrt.c \ - ) - -RGENSTAT_OBJECTS = \ - $(addprefix $(INTERMEDIATE_), $(RGENSTAT_SOURCES:.c=.o)) - -RGENSTAT_HOST_CFLAGS = -g -Werror -Wall $(TOOLS_CFLAGS) - -RGENSTAT_HOST_LFLAGS = $(TOOLS_LFLAGS) -g - -$(RGENSTAT_TARGET): $(RGENSTAT_OBJECTS) | $(RGENSTAT_OUT) - $(ECHO_LD) - ${host_gcc} $(RGENSTAT_OBJECTS) $(RGENSTAT_HOST_LFLAGS) -o $@ - -$(RGENSTAT_INT_)rgenstat.o: $(RGENSTAT_BASE_)rgenstat.c | $(RGENSTAT_INT) - $(ECHO_CC) - ${host_gcc} $(RGENSTAT_HOST_CFLAGS) -c $< -o $@ - -$(RGENSTAT_INT_)llmosrt.o: $(RGENSTAT_BASE_)llmosrt.c | $(RGENSTAT_INT) - $(ECHO_CC) - ${host_gcc} $(RGENSTAT_HOST_CFLAGS) -c $< -o $@ - -.PHONY: rgenstat -rgenstat: $(RGENSTAT_TARGET) - -.PHONY: rgenstat_clean -rgenstat_clean: - -@$(rm) $(RGENSTAT_TARGET) $(RGENSTAT_OBJECTS) 2>$(NUL) -clean: rgenstat_clean diff --git a/reactos/tools/rgenstat/rgenstat.rbuild b/reactos/tools/rgenstat/rgenstat.rbuild new file mode 100644 index 00000000000..6de3bef7407 --- /dev/null +++ b/reactos/tools/rgenstat/rgenstat.rbuild @@ -0,0 +1,6 @@ + + + + rgenstat.c + llmosrt.c + diff --git a/reactos/tools/sysreg/sysreg.mak b/reactos/tools/sysreg/sysreg.mak deleted file mode 100644 index a92ff934e6c..00000000000 --- a/reactos/tools/sysreg/sysreg.mak +++ /dev/null @@ -1,90 +0,0 @@ -SYSREGBUILD_BASE = $(TOOLS_BASE)$(SEP)sysreg -SYSREGBUILD_BASE_ = $(SYSREGBUILD_BASE)$(SEP) -SYSREGBUILD_INT = $(INTERMEDIATE_)$(SYSREGBUILD_BASE) -SYSREGBUILD_INT_ = $(SYSREGBUILD_INT)$(SEP) -SYSREGBUILD_OUT = $(OUTPUT_)$(SYSREGBUILD_BASE) -SYSREGBUILD_OUT_ = $(SYSREGBUILD_OUT)$(SEP) - -$(SYSREGBUILD_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(SYSREGBUILD_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -SYSREGBUILD_TARGET = \ - $(SYSREGBUILD_OUT_)sysreg$(EXEPOSTFIX) - -SYSREGBUILD_SOURCES = $(addprefix $(SYSREGBUILD_BASE_),\ - conf_parser.cpp \ - env_var.cpp \ - rosboot_test.cpp \ - namedpipe_reader.cpp \ - sysreg.cpp \ - file_reader.cpp \ - os_support.cpp \ - ) - -SYSREGBUILD_OBJECTS = \ - $(addprefix $(INTERMEDIATE_), $(SYSREGBUILD_SOURCES:.cpp=.o)) - - -ifeq ($(HOST),mingw32-linux) -SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__LINUX__ -Wall -else -SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__USE_W32API -Iinclude -Iinclude/reactos -Iinclude/psdk -Iinclude$(SEP)crt -Iinclude/reactos/libs -I$(INTERMEDIATE_)$(SEP)include$(SEP)psdk -Wall -endif - -SYSREGBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS) - -.PHONY: sysreg -sysreg: $(SYSREGBUILD_TARGET) -host_gpp += -g - -$(SYSREGBUILD_TARGET): $(SYSREGBUILD_OBJECTS) | $(SYSREGBUILD_OUT) - $(ECHO_LD) - ${host_gpp} $(SYSREGBUILD_OBJECTS) $(SYSREGBUILD_HOST_LFLAGS) -o $@ - -$(SYSREGBUILD_INT_)conf_parser.o: $(SYSREGBUILD_BASE_)conf_parser.cpp | $(SYSREGBUILD_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - -$(SYSREGBUILD_INT_)env_var.o: $(SYSREGBUILD_BASE_)env_var.cpp | $(SYSREGBUILD_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - -$(SYSREGBUILD_INT_)pipe_reader.o: $(SYSREGBUILD_BASE_)pipe_reader.cpp | $(SYSREGBUILD_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - -$(SYSREGBUILD_INT_)namedpipe_reader.o: $(SYSREGBUILD_BASE_)namedpipe_reader.cpp | $(SYSREGBUILD_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - -$(SYSREGBUILD_INT_)rosboot_test.o: $(SYSREGBUILD_BASE_)rosboot_test.cpp | $(SYSREGBUILD_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - -$(SYSREGBUILD_INT_)sym_file.o: $(SYSREGBUILD_BASE_)sym_file.cpp | $(SYSREGBUILD_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - -$(SYSREGBUILD_INT_)sysreg.o: $(SYSREGBUILD_BASE_)sysreg.cpp | $(SYSREGBUILD_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - -$(SYSREGBUILD_INT_)file_reader.o: $(SYSREGBUILD_BASE_)file_reader.cpp | $(SYSREGBUILD_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - -$(SYSREGBUILD_INT_)os_support.o: $(SYSREGBUILD_BASE_)os_support.cpp | $(SYSREGBUILD_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - -.PHONY: sysregbuild_clean -sysreg_clean: - -@$(rm) $(SYSREGBUILD_TARGET) $(SYSREGBUILD_OBJECTS) 2>$(NUL) -clean: sysreg_clean diff --git a/reactos/tools/sysreg/sysreg.rbuild b/reactos/tools/sysreg/sysreg.rbuild new file mode 100644 index 00000000000..8325787c3d7 --- /dev/null +++ b/reactos/tools/sysreg/sysreg.rbuild @@ -0,0 +1,22 @@ + + + + + + + + conf_parser.cpp + env_var.cpp + rosboot_test.cpp + namedpipe_reader.cpp + sysreg.cpp + file_reader.cpp + os_support.cpp + diff --git a/reactos/tools/tools.mak b/reactos/tools/tools.mak index ab54697a4c0..256ce7a09e8 100644 --- a/reactos/tools/tools.mak +++ b/reactos/tools/tools.mak @@ -42,22 +42,12 @@ $(TOOLS_INT_)xml.o: $(TOOLS_BASE_)xml.cpp $(XML_SSPRINTF_HEADERS) | $(TOOLS_INT) include tools/bin2c.mak include tools/buildno/buildno.mak -include tools/cabman/cabman.mak include tools/gendib/gendib.mak ifeq ($(ARCH),powerpc) include tools/ofw_interface/ofw_interface.mak endif -include tools/mkhive/mkhive.mak include tools/nci/nci.mak include tools/pefixup.mak include tools/raddr2line.mak include tools/rbuild/rbuild.mak -include tools/rgenstat/rgenstat.mak include tools/rsym.mak -include tools/sysreg/sysreg.mak -include tools/unicode/unicode.mak -include tools/wpp/wpp.mak -include tools/widl/widl.mak -include tools/winebuild/winebuild.mak -include tools/wmc/wmc.mak -include tools/wrc/wrc.mak diff --git a/reactos/tools/tools.rbuild b/reactos/tools/tools.rbuild index bc7b40cd402..f4817fbf554 100644 --- a/reactos/tools/tools.rbuild +++ b/reactos/tools/tools.rbuild @@ -1,7 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/reactos/tools/unicode/unicode.rbuild b/reactos/tools/unicode/unicode.rbuild new file mode 100644 index 00000000000..f43be12ed9e --- /dev/null +++ b/reactos/tools/unicode/unicode.rbuild @@ -0,0 +1,76 @@ + + + + " " + include/reactos/wine + include/reactos + include + casemap.c + compose.c + cptable.c + mbtowc.c + string.c + wctomb.c + wctype.c + utf8.c + c_037.c + c_424.c + c_437.c + c_500.c + c_737.c + c_775.c + c_850.c + c_852.c + c_855.c + c_856.c + c_857.c + c_860.c + c_861.c + c_862.c + c_863.c + c_864.c + c_865.c + c_866.c + c_869.c + c_874.c + c_875.c + c_878.c + c_932.c + c_936.c + c_949.c + c_950.c + c_1006.c + c_1026.c + c_1250.c + c_1251.c + c_1252.c + c_1253.c + c_1254.c + c_1255.c + c_1256.c + c_1257.c + c_1258.c + c_10000.c + c_10006.c + c_10007.c + c_10029.c + c_10079.c + c_10081.c + c_20866.c + c_20932.c + c_21866.c + c_28591.c + c_28592.c + c_28593.c + c_28594.c + c_28595.c + c_28596.c + c_28597.c + c_28598.c + c_28599.c + c_28600.c + c_28603.c + c_28604.c + c_28605.c + c_28606.c + \ No newline at end of file diff --git a/reactos/tools/widl/widl.mak b/reactos/tools/widl/widl.mak deleted file mode 100644 index de6813ac536..00000000000 --- a/reactos/tools/widl/widl.mak +++ /dev/null @@ -1,131 +0,0 @@ -WIDL_BASE = $(TOOLS_BASE)$(SEP)widl -WIDL_BASE_ = $(WIDL_BASE)$(SEP) -WIDL_INT = $(INTERMEDIATE_)$(WIDL_BASE) -WIDL_INT_ = $(WIDL_INT)$(SEP) -WIDL_OUT = $(OUTPUT_)$(WIDL_BASE) -WIDL_OUT_ = $(WIDL_OUT)$(SEP) - -$(WIDL_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(WIDL_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -WIDL_PORT_BASE = $(WIDL_BASE)$(SEP)port -WIDL_PORT_BASE_ = $(WIDL_PORT_BASE)$(SEP) -WIDL_PORT_INT = $(INTERMEDIATE_)$(WIDL_PORT_BASE) -WIDL_PORT_INT_ = $(WIDL_PORT_INT)$(SEP) -WIDL_PORT_OUT = $(OUTPUT_)$(WIDL_PORT_BASE) -WIDL_PORT_OUT_ = $(WIDL_PORT_OUT)$(SEP) - -$(WIDL_PORT_INT): | $(WIDL_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(WIDL_PORT_OUT): | $(WIDL_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -WIDL_TARGET = \ - $(WIDL_OUT_)widl$(EXEPOSTFIX) - -WIDL_DEPENDS = $(BUILDNO_H) - -WIDL_SOURCES = $(addprefix $(WIDL_BASE_), \ - client.c \ - hash.c \ - header.c \ - proxy.c \ - server.c \ - typegen.c \ - typelib.c \ - utils.c \ - widl.c \ - write_msft.c \ - parser.yy.c \ - parser.tab.c \ - port$(SEP)mkstemps.c \ - ) - -WIDL_OBJECTS = \ - $(addprefix $(INTERMEDIATE_), $(WIDL_SOURCES:.c=.o)) - -WIDL_HOST_CFLAGS = $(TOOLS_CFLAGS) \ - -DINT16=SHORT -D__USE_W32API -DYYDEBUG=1 -D__REACTOS__=1 \ - -I$(WIDL_BASE) -I$(WPP_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \ - -I$(INTERMEDIATE_)include - -WIDL_HOST_LFLAGS = $(TOOLS_LFLAGS) - -WIDL_LIBS = $(WPP_TARGET) - -.PHONY: widl -widl: $(WIDL_TARGET) - -$(WIDL_TARGET): $(WIDL_OBJECTS) $(WIDL_LIBS) | $(WIDL_OUT) - $(ECHO_LD) - ${host_gcc} $(WIDL_OBJECTS) $(WIDL_LIBS) $(WIDL_HOST_LFLAGS) -o $@ - -$(WIDL_INT_)client.o: $(WIDL_BASE_)client.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)hash.o: $(WIDL_BASE_)hash.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)header.o: $(WIDL_BASE_)header.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)proxy.o: $(WIDL_BASE_)proxy.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)server.o: $(WIDL_BASE_)server.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)typegen.o: $(WIDL_BASE_)typegen.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)typelib.o: $(WIDL_BASE_)typelib.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)utils.o: $(WIDL_BASE_)utils.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)widl.o: $(WIDL_BASE_)widl.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)write_msft.o: $(WIDL_BASE_)write_msft.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)parser.yy.o: $(WIDL_BASE_)parser.yy.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)parser.tab.o: $(WIDL_BASE_)parser.tab.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_PORT_INT_)mkstemps.o: $(WIDL_PORT_BASE_)mkstemps.c $(WIDL_DEPENDS) | $(WIDL_PORT_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -.PHONY: widl_clean -widl_clean: - -@$(rm) $(WIDL_TARGET) $(WIDL_OBJECTS) 2>$(NUL) -clean: widl_clean diff --git a/reactos/tools/widl/widl.rbuild b/reactos/tools/widl/widl.rbuild new file mode 100644 index 00000000000..2f45b3a3630 --- /dev/null +++ b/reactos/tools/widl/widl.rbuild @@ -0,0 +1,28 @@ + + + + SHORT + 1 + . + include/reactos/wine + include/reactos + include + include/psdk + include + wpp + client.c + hash.c + header.c + proxy.c + server.c + typegen.c + typelib.c + utils.c + widl.c + write_msft.c + parser.yy.c + parser.tab.c + + mkstemps.c + + diff --git a/reactos/tools/winebuild/winebuild.mak b/reactos/tools/winebuild/winebuild.mak deleted file mode 100644 index 740a45eb6ee..00000000000 --- a/reactos/tools/winebuild/winebuild.mak +++ /dev/null @@ -1,85 +0,0 @@ -WINEBUILD_BASE = $(TOOLS_BASE)$(SEP)winebuild -WINEBUILD_BASE_ = $(WINEBUILD_BASE)$(SEP) -WINEBUILD_INT = $(INTERMEDIATE_)$(WINEBUILD_BASE) -WINEBUILD_INT_ = $(WINEBUILD_INT)$(SEP) -WINEBUILD_OUT = $(OUTPUT_)$(WINEBUILD_BASE) -WINEBUILD_OUT_ = $(WINEBUILD_OUT)$(SEP) - -$(WINEBUILD_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(WINEBUILD_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -WINEBUILD_TARGET = \ - $(WINEBUILD_OUT_)winebuild$(EXEPOSTFIX) - -WINEBUILD_DEPENDS = $(BUILDNO_H) - -WINEBUILD_SOURCES = $(addprefix $(WINEBUILD_BASE_), \ - import.c \ - main.c \ - parser.c \ - res16.c \ - res32.c \ - spec32.c \ - utils.c \ - mkstemps.c \ - ) - -WINEBUILD_OBJECTS = \ - $(addprefix $(INTERMEDIATE_), $(WINEBUILD_SOURCES:.c=.o)) - -WINEBUILD_HOST_CFLAGS = $(TOOLS_CFLAGS) -D__USE_W32API \ - -Iinclude/reactos/wine -Iinclude -Iinclude/reactos \ - -I$(INTERMEDIATE_)include - -WINEBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS) - -.PHONY: winebuild -winebuild: $(WINEBUILD_TARGET) - -$(WINEBUILD_TARGET): $(WINEBUILD_OBJECTS) | $(WINEBUILD_OUT) - $(ECHO_LD) - ${host_gcc} $(WINEBUILD_OBJECTS) $(WINEBUILD_HOST_LFLAGS) -o $@ - -$(WINEBUILD_INT_)import.o: $(WINEBUILD_BASE_)import.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) - $(ECHO_CC) - ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ - -$(WINEBUILD_INT_)main.o: $(WINEBUILD_BASE_)main.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) - $(ECHO_CC) - ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ - -$(WINEBUILD_INT_)parser.o: $(WINEBUILD_BASE_)parser.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) - $(ECHO_CC) - ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ - -$(WINEBUILD_INT_)res16.o: $(WINEBUILD_BASE_)res16.c $(WINEBUILD_DEPENDS | $(WINEBUILD_INT) - $(ECHO_CC) - ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ - -$(WINEBUILD_INT_)res32.o: $(WINEBUILD_BASE_)res32.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) - $(ECHO_CC) - ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ - -$(WINEBUILD_INT_)spec32.o: $(WINEBUILD_BASE_)spec32.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) - $(ECHO_CC) - ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ - -$(WINEBUILD_INT_)utils.o: $(WINEBUILD_BASE_)utils.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) - $(ECHO_CC) - ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ - -$(WINEBUILD_INT_)mkstemps.o: $(WINEBUILD_BASE_)mkstemps.c $(WINEBUILD_DEPENDS) | $(WINEBUILD_INT) - $(ECHO_CC) - ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ - -.PHONY: winebuild_clean -winebuild_clean: - -@$(rm) $(WINEBUILD_TARGET) $(WINEBUILD_OBJECTS) 2>$(NUL) -clean: winebuild_clean diff --git a/reactos/tools/winebuild/winebuild.rbuild b/reactos/tools/winebuild/winebuild.rbuild new file mode 100644 index 00000000000..5398fc0ff4f --- /dev/null +++ b/reactos/tools/winebuild/winebuild.rbuild @@ -0,0 +1,16 @@ + + + + include/reactos/wine + include/reactos + include + include + import.c + main.c + parser.c + res16.c + res32.c + spec32.c + utils.c + mkstemps.c + diff --git a/reactos/tools/wmc/wmc.mak b/reactos/tools/wmc/wmc.mak deleted file mode 100644 index 9c0eff1df84..00000000000 --- a/reactos/tools/wmc/wmc.mak +++ /dev/null @@ -1,78 +0,0 @@ -WMC_BASE = $(TOOLS_BASE_)wmc -WMC_BASE_ = $(WMC_BASE)$(SEP) -WMC_INT = $(INTERMEDIATE_)$(WMC_BASE) -WMC_INT_ = $(WMC_INT)$(SEP) -WMC_OUT = $(OUTPUT_)$(WMC_BASE) -WMC_OUT_ = $(WMC_OUT)$(SEP) - -$(WMC_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(WMC_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -WMC_TARGET = \ - $(WMC_OUT_)wmc$(EXEPOSTFIX) - -WMC_DEPENDS = $(BUILDNO_H) - -WMC_SOURCES = $(addprefix $(WMC_BASE_), \ - lang.c \ - mcl.c \ - utils.c \ - wmc.c \ - write.c \ - mcy.tab.c \ - ) - -WMC_OBJECTS = \ - $(addprefix $(INTERMEDIATE_), $(WMC_SOURCES:.c=.o)) - -WMC_HOST_CFLAGS = -I$(WMC_BASE) $(TOOLS_CFLAGS) \ - -D__USE_W32API -DWINE_UNICODE_API= -I$(UNICODE_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude \ - -I$(INTERMEDIATE_)/include - -WMC_HOST_LFLAGS = $(TOOLS_LFLAGS) - -WMC_LIBS = $(UNICODE_TARGET) - -.PHONY: wmc -wmc: $(WMC_TARGET) - -$(WMC_TARGET): $(WMC_OBJECTS) $(WMC_LIBS) | $(WMC_OUT) - $(ECHO_LD) - ${host_gcc} $(WMC_OBJECTS) $(WMC_LIBS) $(WMC_HOST_LFLAGS) -o $@ - -$(WMC_INT_)lang.o: $(WMC_BASE_)lang.c $(WMC_DEPENDS) | $(WMC_INT) - $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ - -$(WMC_INT_)mcl.o: $(WMC_BASE_)mcl.c $(WMC_DEPENDS) | $(WMC_INT) - $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ - -$(WMC_INT_)utils.o: $(WMC_BASE_)utils.c $(WMC_DEPENDS) | $(WMC_INT) - $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ - -$(WMC_INT_)wmc.o: $(WMC_BASE_)wmc.c $(WMC_DEPENDS) | $(WMC_INT) - $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ - -$(WMC_INT_)write.o: $(WMC_BASE_)write.c $(WMC_DEPENDS) | $(WMC_INT) - $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ - -$(WMC_INT_)mcy.tab.o: $(WMC_BASE_)mcy.tab.c $(WMC_DEPENDS) | $(WMC_INT) - $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ - -.PHONY: wmc_clean -wmc_clean: - -@$(rm) $(WMC_TARGET) $(WMC_OBJECTS) 2>$(NUL) -clean: wmc_clean diff --git a/reactos/tools/wmc/wmc.rbuild b/reactos/tools/wmc/wmc.rbuild new file mode 100644 index 00000000000..ef89b145008 --- /dev/null +++ b/reactos/tools/wmc/wmc.rbuild @@ -0,0 +1,17 @@ + + + + " " + . + include/reactos/wine + include/reactos + include + include + unicode + lang.c + mcl.c + utils.c + wmc.c + write.c + mcy.tab.c + diff --git a/reactos/tools/wpp/wpp.rbuild b/reactos/tools/wpp/wpp.rbuild new file mode 100644 index 00000000000..8e4ca429fd2 --- /dev/null +++ b/reactos/tools/wpp/wpp.rbuild @@ -0,0 +1,12 @@ + + + + include/reactos/wine + include/reactos + include + include + lex.yy.c + preproc.c + wpp.c + ppy.tab.c + diff --git a/reactos/tools/wrc/wrc.mak b/reactos/tools/wrc/wrc.mak deleted file mode 100644 index 2a84b11be90..00000000000 --- a/reactos/tools/wrc/wrc.mak +++ /dev/null @@ -1,121 +0,0 @@ -WRC_BASE = $(TOOLS_BASE_)wrc -WRC_BASE_ = $(WRC_BASE)$(SEP) -WRC_INT = $(INTERMEDIATE_)$(WRC_BASE) -WRC_INT_ = $(WRC_INT)$(SEP) -WRC_OUT = $(OUTPUT_)$(WRC_BASE) -WRC_OUT_ = $(WRC_OUT)$(SEP) - -$(WRC_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(WRC_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -WRC_PORT_BASE = $(WRC_BASE)$(SEP)port -WRC_PORT_BASE_ = $(WRC_PORT_BASE)$(SEP) -WRC_PORT_INT = $(INTERMEDIATE_)$(WRC_PORT_BASE) -WRC_PORT_INT_ = $(WRC_PORT_INT)$(SEP) -WRC_PORT_OUT = $(OUTPUT_)$(WRC_PORT_BASE) -WRC_PORT_OUT_ = $(WRC_PORT_OUT)$(SEP) - -$(WRC_PORT_INT): | $(WRC_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(WRC_PORT_OUT): | $(WRC_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -WRC_TARGET = \ - $(WRC_OUT_)wrc$(EXEPOSTFIX) - -WRC_DEPENDS = $(BUILDNO_H) - -WRC_SOURCES = $(addprefix $(WRC_BASE_), \ - dumpres.c \ - genres.c \ - newstruc.c \ - readres.c \ - translation.c \ - utils.c \ - wrc.c \ - writeres.c \ - parser.tab.c \ - lex.yy.c \ - port$(SEP)mkstemps.c \ - ) - -WRC_OBJECTS = \ - $(addprefix $(INTERMEDIATE_), $(WRC_SOURCES:.c=.o)) - -WRC_HOST_CFLAGS = -I$(WRC_BASE) $(TOOLS_CFLAGS) \ - -D__USE_W32API -DWINE_UNICODE_API= \ - -I$(UNICODE_BASE) -I$(WPP_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude \ - -I$(INTERMEDIATE_)include - -WRC_HOST_LFLAGS = $(TOOLS_LFLAGS) - -WRC_LIBS = $(UNICODE_TARGET) $(WPP_TARGET) - -.PHONY: wrc -wrc: $(WRC_TARGET) - -$(WRC_TARGET): $(WRC_OBJECTS) $(WRC_LIBS) | $(WRC_OUT) - $(ECHO_LD) - ${host_gcc} $(WRC_OBJECTS) $(WRC_LIBS) $(WRC_HOST_LFLAGS) -o $@ - -$(WRC_INT_)dumpres.o: $(WRC_BASE_)dumpres.c $(WRC_DEPENDS) | $(WRC_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_INT_)genres.o: $(WRC_BASE_)genres.c $(WRC_DEPENDS) | $(WRC_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_INT_)newstruc.o: $(WRC_BASE_)newstruc.c $(WRC_DEPENDS) | $(WRC_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_INT_)readres.o: $(WRC_BASE_)readres.c $(WRC_DEPENDS) | $(WRC_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_INT_)translation.o: $(WRC_BASE_)translation.c $(WRC_DEPENDS) | $(WRC_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_INT_)utils.o: $(WRC_BASE_)utils.c $(WRC_DEPENDS) | $(WRC_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_INT_)wrc.o: $(WRC_BASE_)wrc.c $(WRC_DEPENDS) | $(WRC_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_INT_)writeres.o: $(WRC_BASE_)writeres.c $(WRC_DEPENDS) | $(WRC_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_INT_)parser.tab.o: $(WRC_BASE_)parser.tab.c $(WRC_DEPENDS) | $(WRC_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_INT_)lex.yy.o: $(WRC_BASE_)lex.yy.c $(WRC_DEPENDS) | $(WRC_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_PORT_INT_)mkstemps.o: $(WRC_PORT_BASE_)mkstemps.c $(WRC_DEPENDS) | $(WRC_PORT_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -.PHONY: wrc_clean -wrc_clean: - -@$(rm) $(WRC_TARGET) $(WRC_OBJECTS) 2>$(NUL) -clean: wrc_clean diff --git a/reactos/tools/wrc/wrc.rbuild b/reactos/tools/wrc/wrc.rbuild new file mode 100644 index 00000000000..c7d4275064b --- /dev/null +++ b/reactos/tools/wrc/wrc.rbuild @@ -0,0 +1,26 @@ + + + + " " + + + include/reactos/wine + include/reactos + include + include + unicode + wpp + dumpres.c + genres.c + newstruc.c + readres.c + translation.c + utils.c + wrc.c + writeres.c + parser.tab.c + lex.yy.c + + mkstemps.c + +