Changeset 2622 for box/trunk/infrastructure

Timestamp:

19/02/2010 18:39:38 (2 years ago)

Author:

chris

Message:

Make the explicit target of each dependency, including libraries, to solve
problems with integrating QDBM into build system (default target tries to
build stuff we don't want).

File:

• box/trunk/infrastructure/makebuildenv.pl.in (modified) (2 diffs)

box/trunk/infrastructure/makebuildenv.pl.in

@@ -480 +480 @@
         
         my @all_deps_for_module;
+
         {
                 # work out what dependencies need to be run
@@ -769 +770 @@
                 for my $dep (@all_deps_for_module)
                 {
-                        $deps_makeinfo .= "\t\t\$(HIDE) (cd ../../$dep; \$(MAKE)$sub_make_options -q \$(DEPENDMAKEFLAGS) -D NODEPS || \$(MAKE)$sub_make_options \$(DEPENDMAKEFLAGS) -D NODEPS)\n";
+                        my $dep_target = "";
+                        if ($dep =~ m|^lib/(.*)|)
+                        {
+                                $dep_target = "\$(OUTBASE)/$dep/$1.a";
+                        }
+                        elsif ($dep =~ m|^.*/(.*)|)
+                        {
+                                $dep_target = "\$(OUTBASE)/$dep/$1$platform_exe_ext";
+                        }
+                        else
+                        {
+                                $dep_target = "lib$dep.a";
+                        }
+
+                        $deps_makeinfo .= <<EOF;
+        \$(HIDE) ( \\
+                cd ../../$dep; \\
+                \$(MAKE) $sub_make_options -q \$(DEPENDMAKEFLAGS) -D NODEPS $dep_target \\
+                || \$(MAKE) $sub_make_options \$(DEPENDMAKEFLAGS) -D NODEPS $dep_target \\
+        )
+EOF
                 }