Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 08:15:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix dlltool target directory dependencies

Browse source 
add buildno's output to clean:

svn path=/branches/xmlbuildsystem/; revision=14071
This commit is contained in:
Royce Mitchell III 2005-03-14 20:06:14 +00:00
parent d12b2619f0
commit 22e89b83ae
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/tools/buildno/buildno.mak
View file

@ -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)

13
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
View file

@ -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" );