msys compatibility fix

[reactos.git] / reactos / tools / rbuild / makefile

diff --git a/reactos/tools/rbuild/makefile b/reactos/tools/rbuild/makefile
index 1d94f5b..7af7ef4 100644 (file)
--- a/reactos/tools/rbuild/makefile
+++ b/reactos/tools/rbuild/makefile
@@ -4,29 +4,55 @@ TARGET = rbuild$(EXE_POSTFIX)
 \r
 all: $(TARGET)\r
 \r
-BASE_OBJECTS = xml.o project.o module.o\r
+BACKEND_MINGW_BASE_OBJECTS = \\r
+       backend/mingw/mingw.o \\r
+       backend/mingw/modulehandler.o\r
+       \r
+BACKEND_BASE_OBJECTS = \\r
+       $(BACKEND_MINGW_BASE_OBJECTS) \\r
+       backend/backend.o\r
+\r
+BASE_OBJECTS = \\r
+       $(BACKEND_BASE_OBJECTS) \\r
+       define.o \\r
+       exception.o \\r
+       include.o \\r
+       linkerflag.o \\r
+       module.o \\r
+       project.o \\r
+       ssprintf.o \\r
+       XML.o\r
 \r
 OBJECTS = $(BASE_OBJECTS) rbuild.o\r
 \r
-TESTS = tests/moduletest.o\r
+TESTS = \\r
+       tests/definetest.o \\r
+       tests/iftest.o \\r
+       tests/includetest.o \\r
+       tests/invoketest.o \\r
+       tests/linkerflagtest.o \\r
+       tests/moduletest.o \\r
+       tests/projecttest.o\r
 \r
 TEST_OBJECTS = $(BASE_OBJECTS) $(TESTS) tests/alltests.o\r
 \r
-HOST_CFLAGS = -g -I. -Werror -Wall\r
+HOST_CXXFLAGS = -g -I. -Werror -Wall\r
 \r
 HOST_LFLAGS = -g\r
 \r
 rbuild$(EXE_POSTFIX): $(OBJECTS)\r
        $(HOST_CXX) $(OBJECTS) $(HOST_LFLAGS) -o rbuild$(EXE_POSTFIX)\r
 \r
+ifeq ($(HOST),"")\r
+echo Please set HOST variable to mingw32-windows or mingw32-linux\r
+endif\r
 ifeq ($(HOST),mingw32-linux)\r
 clean:\r
        -rm -f *.o\r
        -rm -f rbuild$(EXE_POSTFIX)\r
        -rm -f tests/*.o\r
        -rm -f rbuild_tests$(EXE_POSTFIX)\r
-endif\r
-ifeq ($(HOST),mingw32-windows)\r
+else\r
 clean:\r
        -del *.o\r
        -del rbuild$(EXE_POSTFIX)\r
@@ -38,10 +64,10 @@ endif
 \r
 %.o: %.cpp\r
        $(HALFVERBOSEECHO) [CXX]     $<\r
-       $(HOST_CXX) $(HOST_CFLAGS) -c $< -o $@\r
+       $(HOST_CXX) $(HOST_CXXFLAGS) -c $< -o $@\r
 \r
 test: rbuild_tests$(EXE_POSTFIX)\r
-       $(EXE_PREFIX)rbuild_tests$(EXE_POSTFIX)\r
+       ./$(EXE_PREFIX)rbuild_tests$(EXE_POSTFIX)\r
 \r
 rbuild_tests$(EXE_POSTFIX): $(TEST_OBJECTS)\r
        $(HOST_CXX) $(TEST_OBJECTS) $(HOST_LFLAGS) -o rbuild_tests$(EXE_POSTFIX)\r