diff --git a/reactos/tools/buildno/buildno.mak b/reactos/tools/buildno/buildno.mak index cf95d08a88a..c440c483786 100644 --- a/reactos/tools/buildno/buildno.mak +++ b/reactos/tools/buildno/buildno.mak @@ -3,7 +3,7 @@ BUILDNO_BASE = tools$(SEP)buildno BUILDNO_BASE_DIR = $(INTERMEDIATE)$(BUILDNO_BASE) $(BUILDNO_BASE_DIR): $(RMKDIR_TARGET) - ${mkdir} $(INTERMEDIATE)$(BUILDNO_BASE) + ${mkdir} $@ BUILDNO_TARGET = \ $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno$(EXEPOSTFIX) @@ -44,6 +44,7 @@ $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)XML.o: $(BUILDNO_BASE_DIR) $(BUILDNO_BASE)$( .PHONY: buildno_clean buildno_clean: -@$(rm) $(BUILDNO_TARGET) $(BUILDNO_OBJECTS) 2>$(NUL) +clean: buildno_clean $(BUILDNO_H): $(BUILDNO_TARGET) $(EXEPREFIX)$(BUILDNO_TARGET) $(BUILDNO_H) diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp index 1989fb33501..e49a9c1e8ff 100644 --- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp +++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp @@ -1109,9 +1109,10 @@ MingwModuleHandler::GenerateArchiveTarget ( const Module& module, string archiveFilename = GetModuleArchiveFilename ( module ); fprintf ( fMakefile, - "%s: %s\n", + "%s: %s %s\n", archiveFilename.c_str (), - objs_macro.c_str ()); + objs_macro.c_str (), + GetDirectory(archiveFilename).c_str() ); fprintf ( fMakefile, "\t$(ECHO_AR)\n" ); @@ -1213,7 +1214,9 @@ MingwModuleHandler::GenerateMacrosAndTargets ( nasmflagsMacro = ssprintf ("$(%s)", nasmflagsMacro.c_str ()); objectsMacro = ssprintf ("$(%s)", objectsMacro.c_str ()); - string ar_target = GenerateArchiveTarget ( module, ar, objectsMacro ); + string ar_target = + GenerateArchiveTarget ( module, ar, objectsMacro ); + GenerateObjectFileTargets ( module, cc, cppc, @@ -1366,8 +1369,8 @@ MingwModuleHandler::GenerateImportLibraryTargetIfNeeded ( string definitionDependencies = GetDefinitionDependencies ( module ); fprintf ( fMakefile, "%s: %s %s\n", library_target.c_str (), - library_target.c_str (), - definitionDependencies.c_str () ); + definitionDependencies.c_str (), + GetDirectory(library_target).c_str () ); fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" );