[svn:parrot] r43220 - in trunk: config/gen/makefiles tools/dev

[coke at svn.parrot.org]

Author: coke
Date: Wed Dec 23 06:11:05 2009
New Revision: 43220
URL: https://trac.parrot.org/parrot/changeset/43220

Log:
when checking deps, check all _DIR vars. Fixup deps on newly caught files.

Modified:
   trunk/config/gen/makefiles/root.in
   trunk/tools/dev/checkdepend.pl

Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in	Wed Dec 23 04:39:43 2009	(r43219)
+++ trunk/config/gen/makefiles/root.in	Wed Dec 23 06:11:05 2009	(r43220)
@@ -856,7 +856,7 @@
 
 $(SRC_DIR)/parrot_config$(O) : $(SRC_DIR)/parrot_config.c $(INC_DIR)/parrot.h
 
-$(SRC_DIR)/install_config$(O) : $(SRC_DIR)/install_config.c
+$(SRC_DIR)/install_config$(O) : $(INC_DIR)/parrot.h
 
 $(SRC_DIR)/null_config$(O) : $(INC_DIR)/parrot.h $(SRC_DIR)/null_config.c
 
@@ -1009,8 +1009,6 @@
 #
 ###############################################################################
 
-$(IMCC_DIR)/main$(O) : $(IMCC_DIR)/main.c $(GENERAL_H_FILES)
-
 $(INC_DIR)/oplib/ops.h lib/Parrot/OpLib/core.pm : $(OPS_FILES) $(BUILD_TOOLS_DIR)/ops2pm.pl \
     lib/Parrot/OpsFile.pm lib/Parrot/Op.pm $(OPS_DIR)/ops.num $(OPS_DIR)/ops.skip
 	$(PERL) $(BUILD_TOOLS_DIR)/ops2pm.pl @no_lines_flag@ $(OPS_FILES)
@@ -1229,7 +1227,7 @@
         $(INC_DIR)/embed.h $(INC_DIR)/extend.h $(INC_DIR)/packfile.h \
         $(INC_DIR)/parrot.h $(INC_DIR)/runcore_api.h
 
-$(PF_DIR)/pf_items$(O) : $(GENERAL_H_FILES)
+$(PF_DIR)/pf_items$(O) : $(INC_DIR)/parrot.h
 
 $(SRC_DIR)/packout$(O) : $(INC_DIR)/packfile.h $(INC_DIR)/parrot.h \
         $(PMC_INC_DIR)/pmc/pmc_key.h

Modified: trunk/tools/dev/checkdepend.pl
==============================================================================
--- trunk/tools/dev/checkdepend.pl	Wed Dec 23 04:39:43 2009	(r43219)
+++ trunk/tools/dev/checkdepend.pl	Wed Dec 23 06:11:05 2009	(r43220)
@@ -53,13 +53,15 @@
     local undef $/;
     $rules = <$mf>;
 }
+
+# convert all \-newline continuations into single lines for ease of processing.
 $rules =~ s/\\\n/ /g;
-$rules =~ s/\Q$(SRC_DIR)\E/src/g;
-$rules =~ s/\Q$(IO_DIR)\E/src\/io/g;
-$rules =~ s/\Q$(PIRC_DIR)\E/compilers\/pirc\/src/g;
-$rules =~ s/\Q$(PMC_INC_DIR)\E/include/g;
-$rules =~ s/\Q$(INC_DIR)\E/include\/parrot/g;
-$rules =~ s/\Q$(OPS_DIR)\E/src\/ops/g;
+
+# replace all _DIR variables with their expansions.
+while ($rules =~ s/^([A-Z_]+_DIR)\s*:?=\s*(\S*)$//m) {
+    my ($var,$val) = ($1, $2);
+    $rules =~ s/\$\($var\)/$val/g;
+}
 
 foreach my $file (sort keys %deps) {
     my $rule = $file;