[ros-diffs] [mpiulachs] 33322: -Fix unnecessary msi builds, this time for real! msi module was referencing the module 'msi_msiserver_typelib' expecting (OUTPUT)msi_msiserver_typelib.tlb to be build inset of (INTERMEDIATE)msiserver.tlb (the actual generated file). As a result the file was never created and make was trying to recreate it on every build. mystery solved :) (part 1/2)

[mpiulachs at svn.reactos.org]

Author: mpiulachs
Date: Tue May  6 09:42:49 2008
New Revision: 33322

URL: http://svn.reactos.org/svn/reactos?rev=33322&view=rev
Log:
-Fix unnecessary msi builds, this time for real! msi module was referencing the module 'msi_msiserver_typelib' expecting (OUTPUT)msi_msiserver_typelib.tlb to be build inset of (INTERMEDIATE)msiserver.tlb (the actual generated file). As a result the file was never created and make was trying to recreate it on every build. mystery solved :) (part 1/2)

Modified:
    trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
    trunk/reactos/tools/rbuild/module.cpp

Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp?rev=33322&r1=33321&r2=33322&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Tue May  6 09:42:49 2008
@@ -1340,7 +1340,7 @@
                      "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o",
                      "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
 Rule widlTlbRule ( "$(source): ${$(module_name)_precondition}\n"
-                   "$(OUTPUT)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+                   "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
                    "\t$(ECHO_WIDL)\n"
                    "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).tlb $(source)\n",
                    "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );

Modified: trunk/reactos/tools/rbuild/module.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?rev=33322&r1=33321&r2=33322&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Tue May  6 09:42:49 2008
@@ -970,10 +970,10 @@
 		case LiveIso:
 		case IsoRegTest:
 		case LiveIsoRegTest:
-		case EmbeddedTypeLib:
 		case ElfExecutable:
 		case Cabinet:
 			return OutputDirectory;
+		case EmbeddedTypeLib:
 		case StaticLibrary:
 		case HostStaticLibrary:
 		case ObjectLibrary: