fix dlltool target directory dependencies
add buildno's output to clean:
Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak
Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp
_____
Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak
--- branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak
2005-03-14 19:42:00 UTC (rev 14070)
+++ branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak
2005-03-14 20:06:14 UTC (rev 14071)
@@ -3,7 +3,7 @@
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 @@
.PHONY: buildno_clean
buildno_clean:
-@$(rm) $(BUILDNO_TARGET) $(BUILDNO_OBJECTS) 2>$(NUL)
+clean: buildno_clean
$(BUILDNO_H): $(BUILDNO_TARGET)
$(EXEPREFIX)$(BUILDNO_TARGET) $(BUILDNO_H)
_____
Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp
---
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp 2005-03-14 19:42:00 UTC (rev 14070)
+++
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp 2005-03-14 20:06:14 UTC (rev 14071)
@@ -1109,9 +1109,10 @@
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 @@
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 @@
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" );
Show replies by date