Changeset 2666 for box/RELEASE/0.11rc7/infrastructure/makeparcels.pl.in

Timestamp:

08/03/2010 22:03:42 (2 years ago)

Author:

chris

Message:

Merge [2608] from trunk into 0.11rc7. Fix the default and clean targets
by moving cleaning lines back where they belong, re-adding dependencies.

File:

• box/RELEASE/0.11rc7/infrastructure/makeparcels.pl.in (modified) (4 diffs)

box/RELEASE/0.11rc7/infrastructure/makeparcels.pl.in

@@ -116 +116 @@
 print MAKE "all:\t",join(' ',map {"build-".$_} @parcels),"\n\n";
 
-print MAKE "clean:\n";
-for my $parcel (@parcels)
-{
-        print MAKE "\trm -rf ", BoxPlatform::parcel_dir($parcel),    "\n";
-        print MAKE "\trm -f ",  BoxPlatform::parcel_target($parcel), "\n";
-}
-
-if ($build_os eq 'CYGWIN')
-{
-        print MAKE "\tfind release debug -type f | xargs -r rm -f\n";
-}
-else
-{
-        print MAKE "\tfind release debug -type f -exec rm -f {} \\;\n";
-}
-
 print MAKE <<__END_OF_FRAGMENT;
-        \$(MAKE) -C docs clean
-
 test:   release/common/test
 
@@ -147 +129 @@
 
 my $release_flag = BoxPlatform::make_flag('RELEASE');
+my @clean_deps;
 
 for my $parcel (@parcels)
@@ -260 +243 @@
                         push @parcel_deps, "$dir/docs/${name}.html";
                 }
+                elsif ($type eq 'subdir')
+                {
+                        print MAKE <<EOF;
+.PHONY: $name-build $name-clean
+
+$name-build:
+        \$(MAKE) -C $name
+
+$name-clean:
+        \$(MAKE) -C $name clean
+EOF
+                        push @parcel_deps, "$name-build";
+                        push @clean_deps,  "$name-clean";
+                }
         }
 
@@ -352 +349 @@
 }
 
-print MAKE <<__E;
+print MAKE <<EOF;
 install:
         cat local/install.msg
 
-__E
+clean: @clean_deps
+        \$(MAKE) -C docs clean
+EOF
+
+if ($build_os eq 'CYGWIN')
+{
+        print MAKE "\tfind release debug -type f | xargs -r rm -f\n";
+}
+else
+{
+        print MAKE "\tfind release debug -type f -exec rm -f {} \\;\n";
+}
+
+for my $parcel (@parcels)
+{
+        print MAKE "\trm -rf ", BoxPlatform::parcel_dir($parcel),    "\n";
+        print MAKE "\trm -f ",  BoxPlatform::parcel_target($parcel), "\n";
+}
 
 close MAKE;