[svn:parrot] r43357 - in branches/one_make: . compilers/data_json compilers/imcc compilers/json compilers/nqp compilers/pct compilers/pge compilers/tge config/gen/makefiles ext/nqp-rx runtime/parrot/library

coke at svn.parrot.org coke at svn.parrot.org
Fri Jan 1 18:30:38 UTC 2010


Author: coke
Date: Fri Jan  1 18:30:36 2010
New Revision: 43357
URL: https://trac.parrot.org/parrot/changeset/43357

Log:
Break up Makefile.mak's into Define and Rule sections; helps avoid order issues
in combined singleton Makefile.

Added:
   branches/one_make/compilers/data_json/Defines.mak
   branches/one_make/compilers/data_json/Rules.mak   (contents, props changed)
      - copied, changed from r43348, branches/one_make/compilers/data_json/Makefile.mak
   branches/one_make/compilers/imcc/Defines.mak
   branches/one_make/compilers/imcc/Rules.mak   (contents, props changed)
      - copied, changed from r43348, branches/one_make/compilers/imcc/Makefile.mak
   branches/one_make/compilers/json/Defines.mak
   branches/one_make/compilers/json/Rules.mak   (contents, props changed)
      - copied, changed from r43348, branches/one_make/compilers/json/Makefile.mak
   branches/one_make/compilers/nqp/Defines.mak
   branches/one_make/compilers/nqp/Rules.mak   (contents, props changed)
      - copied, changed from r43348, branches/one_make/compilers/nqp/Makefile.mak
   branches/one_make/compilers/pct/Defines.mak
   branches/one_make/compilers/pct/Rules.mak   (contents, props changed)
      - copied, changed from r43348, branches/one_make/compilers/pct/Makefile.mak
   branches/one_make/compilers/pge/Defines.mak
   branches/one_make/compilers/pge/Rules.mak   (contents, props changed)
      - copied, changed from r43348, branches/one_make/compilers/pge/Makefile.mak
   branches/one_make/compilers/tge/Defines.mak
   branches/one_make/compilers/tge/Rules.mak   (contents, props changed)
      - copied, changed from r43348, branches/one_make/compilers/tge/Makefile.mak
   branches/one_make/ext/nqp-rx/Defines.mak
   branches/one_make/ext/nqp-rx/Rules.mak   (contents, props changed)
      - copied, changed from r43348, branches/one_make/ext/nqp-rx/Makefile.mak
   branches/one_make/runtime/parrot/library/Rules.mak   (props changed)
      - copied unchanged from r43348, branches/one_make/runtime/parrot/library/Makefile.mak
Deleted:
   branches/one_make/compilers/data_json/Makefile.mak
   branches/one_make/compilers/imcc/Makefile.mak
   branches/one_make/compilers/json/Makefile.mak
   branches/one_make/compilers/nqp/Makefile.mak
   branches/one_make/compilers/pct/Makefile.mak
   branches/one_make/compilers/pge/Makefile.mak
   branches/one_make/compilers/tge/Makefile.mak
   branches/one_make/ext/nqp-rx/Makefile.mak
   branches/one_make/runtime/parrot/library/Makefile.mak
Modified:
   branches/one_make/MANIFEST
   branches/one_make/config/gen/makefiles/root.in

Modified: branches/one_make/MANIFEST
==============================================================================
--- branches/one_make/MANIFEST	Fri Jan  1 17:57:41 2010	(r43356)
+++ branches/one_make/MANIFEST	Fri Jan  1 18:30:36 2010	(r43357)
@@ -1,7 +1,7 @@
 # ex: set ro:
 # $Id$
 #
-# generated by tools/dev/mk_manifest_and_skip.pl Thu Dec 31 18:57:26 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Fri Jan  1 02:48:55 2010 UT
 #
 # See below for documentation on the format of this file.
 #
@@ -28,11 +28,13 @@
 RESPONSIBLE_PARTIES                                         [main]doc
 TODO                                                        []
 VERSION                                                     [devel]
-compilers/data_json/Makefile.mak                            [data_json]
+compilers/data_json/Defines.mak                             [data_json]
+compilers/data_json/Rules.mak                               [data_json]
 compilers/data_json/data_json.pir                           [data_json]
 compilers/data_json/data_json/grammar.pg                    [data_json]
 compilers/data_json/data_json/pge2pir.tg                    [data_json]
-compilers/imcc/Makefile.mak                                 [imcc]
+compilers/imcc/Defines.mak                                  [imcc]
+compilers/imcc/Rules.mak                                    [imcc]
 compilers/imcc/cfg.c                                        [imcc]
 compilers/imcc/cfg.h                                        [imcc]
 compilers/imcc/debug.c                                      [imcc]
@@ -60,10 +62,11 @@
 compilers/imcc/symreg.c                                     [imcc]
 compilers/imcc/symreg.h                                     [imcc]
 compilers/imcc/unit.h                                       [imcc]
+compilers/json/Defines.mak                                  [json]
 compilers/json/JSON.pir                                     [json]
 compilers/json/JSON/grammar.pg                              [json]
 compilers/json/JSON/pge2pir.tg                              [json]
-compilers/json/Makefile.mak                                 [json]
+compilers/json/Rules.mak                                    [json]
 compilers/ncigen/MAINTAINER                                 [ncigen]
 compilers/ncigen/NCIGEN.TODO                                [ncigen]
 compilers/ncigen/NCIGENP6.pm                                [ncigen]
@@ -83,8 +86,9 @@
 compilers/ncigen/t/parse_00.t                               [test]
 compilers/ncigen/t/parse_01.t                               [test]
 compilers/ncigen/t/parse_02.t                               [test]
-compilers/nqp/Makefile.mak                                  [nqp]
+compilers/nqp/Defines.mak                                   [nqp]
 compilers/nqp/README.pod                                    []doc
+compilers/nqp/Rules.mak                                     [nqp]
 compilers/nqp/TODO.pod                                      [nqp]
 compilers/nqp/bootstrap/actions.pm                          [nqp]
 compilers/nqp/bootstrap/nqp.pir                             [nqp]
@@ -124,9 +128,10 @@
 compilers/nqp/t/29-self.t                                   [test]
 compilers/nqp/t/30-subclass.t                               [test]
 compilers/nqp/t/harness                                     [test]
-compilers/pct/Makefile.mak                                  [pct]
+compilers/pct/Defines.mak                                   [pct]
 compilers/pct/PCT.pir                                       [pct]
 compilers/pct/README.pod                                    []doc
+compilers/pct/Rules.mak                                     [pct]
 compilers/pct/src/PAST.pir                                  [pct]
 compilers/pct/src/PAST/Compiler.pir                         [pct]
 compilers/pct/src/PAST/Node.pir                             [pct]
@@ -136,7 +141,7 @@
 compilers/pct/src/PCT/Node.pir                              [pct]
 compilers/pct/src/POST/Compiler.pir                         [pct]
 compilers/pct/src/POST/Node.pir                             [pct]
-compilers/pge/Makefile.mak                                  [pge]
+compilers/pge/Defines.mak                                   [pge]
 compilers/pge/P6Rule.grammar                                [pge]
 compilers/pge/PGE.pir                                       [pge]
 compilers/pge/PGE/Exp.pir                                   [pge]
@@ -147,6 +152,7 @@
 compilers/pge/PGE/Regex.pir                                 [pge]
 compilers/pge/PGE/builtins.pg                               [pge]
 compilers/pge/README.pod                                    []doc
+compilers/pge/Rules.mak                                     [pge]
 compilers/pge/STATUS                                        [pge]
 compilers/pirc/README.pod                                   []doc
 compilers/pirc/TODO                                         [pirc]
@@ -199,8 +205,9 @@
 compilers/pirc/t/macro.t                                    [test]
 compilers/pirc/t/stmts.t                                    [test]
 compilers/pirc/t/subflags.t                                 [test]
-compilers/tge/Makefile.mak                                  [tge]
+compilers/tge/Defines.mak                                   [tge]
 compilers/tge/README                                        []doc
+compilers/tge/Rules.mak                                     [tge]
 compilers/tge/TGE.pir                                       [tge]
 compilers/tge/TGE/Compiler.pir                              [tge]
 compilers/tge/TGE/Grammar.pir                               [tge]
@@ -942,9 +949,10 @@
 ext/SQLite3/test.pir                                        []
 ext/nqp-rx/.gitignore                                       []
 ext/nqp-rx/CREDITS                                          []
+ext/nqp-rx/Defines.mak                                      []
 ext/nqp-rx/LICENSE                                          []
-ext/nqp-rx/Makefile.mak                                     []
 ext/nqp-rx/README                                           []doc
+ext/nqp-rx/Rules.mak                                        []
 ext/nqp-rx/STATUS                                           []
 ext/nqp-rx/src/stage0/HLL-s0.pir                            []
 ext/nqp-rx/src/stage0/NQP-s0.pir                            []
@@ -1231,7 +1239,6 @@
 runtime/parrot/library/Iter.pir                             [library]
 runtime/parrot/library/JSON.pir                             [library]
 runtime/parrot/library/MIME/Base64.pir                      [library]
-runtime/parrot/library/Makefile.mak                         [library]
 runtime/parrot/library/Math/Rand.pir                        [library]
 runtime/parrot/library/Math/Random/mt19937ar.pir            [library]
 runtime/parrot/library/NCI/Utils.pir                        [library]
@@ -1250,6 +1257,7 @@
 runtime/parrot/library/Pg.pir                               [library]
 runtime/parrot/library/Protoobject.pir                      [library]
 runtime/parrot/library/Range.pir                            [library]
+runtime/parrot/library/Rules.mak                            [library]
 runtime/parrot/library/SDL.pir                              [library]
 runtime/parrot/library/SDL/App.pir                          [library]
 runtime/parrot/library/SDL/Button.pir                       [library]

Added: branches/one_make/compilers/data_json/Defines.mak
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/one_make/compilers/data_json/Defines.mak	Fri Jan  1 18:30:36 2010	(r43357)
@@ -0,0 +1 @@
+DATA_JSON_LIB_PBCS = compilers/data_json/data_json.pbc

Deleted: branches/one_make/compilers/data_json/Makefile.mak
==============================================================================
--- branches/one_make/compilers/data_json/Makefile.mak	Fri Jan  1 18:30:36 2010	(r43356)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,12 +0,0 @@
-DATA_JSON_LIB_PBCS = compilers/data_json/data_json.pbc
-
-compilers/data_json/data_json.pbc : $(PARROT) \
-    compilers/data_json/data_json/grammar.pbc \
-    compilers/data_json/data_json/pge2pir.pbc \
-    compilers/data_json/data_json.pir
-
-compilers/data_json/data_json/grammar.pir : compilers/data_json/data_json/grammar.pg $(LIBRARY_DIR)/PGE/Perl6Grammar.pbc $(LIBRARY_DIR)/PCT/HLLCompiler.pbc
-	$(PARROT) $(LIBRARY_DIR)/PGE/Perl6Grammar.pbc --output=$@ compilers/data_json/data_json/grammar.pg
-
-compilers/data_json/data_json/pge2pir.pir : compilers/data_json/data_json/pge2pir.tg $(PARROT) compilers/tge/tgc.pbc
-	$(PARROT) compilers/tge/tgc.pbc --output=$@ compilers/data_json/pge2pir.tg

Copied and modified: branches/one_make/compilers/data_json/Rules.mak (from r43348, branches/one_make/compilers/data_json/Makefile.mak)
==============================================================================
--- branches/one_make/compilers/data_json/Makefile.mak	Thu Dec 31 20:37:41 2009	(r43348, copy source)
+++ branches/one_make/compilers/data_json/Rules.mak	Fri Jan  1 18:30:36 2010	(r43357)
@@ -1,5 +1,3 @@
-DATA_JSON_LIB_PBCS = compilers/data_json/data_json.pbc
-
 compilers/data_json/data_json.pbc : $(PARROT) \
     compilers/data_json/data_json/grammar.pbc \
     compilers/data_json/data_json/pge2pir.pbc \

Added: branches/one_make/compilers/imcc/Defines.mak
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/one_make/compilers/imcc/Defines.mak	Fri Jan  1 18:30:36 2010	(r43357)
@@ -0,0 +1,16 @@
+# these are private to the IMCC subsystem
+IMCC_O_FILES = \
+    compilers/imcc/imcparser$(O) \
+    compilers/imcc/imclexer$(O) \
+    compilers/imcc/imc$(O) \
+    compilers/imcc/main$(O) \
+    compilers/imcc/symreg$(O) \
+    compilers/imcc/instructions$(O) \
+    compilers/imcc/cfg$(O) \
+    compilers/imcc/reg_alloc$(O) \
+    compilers/imcc/sets$(O) \
+    compilers/imcc/debug$(O) \
+    compilers/imcc/optimizer$(O) \
+    compilers/imcc/pbc$(O) \
+    compilers/imcc/parser_util$(O) \
+    compilers/imcc/pcc$(O)

Deleted: branches/one_make/compilers/imcc/Makefile.mak
==============================================================================
--- branches/one_make/compilers/imcc/Makefile.mak	Fri Jan  1 18:30:36 2010	(r43356)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,224 +0,0 @@
-# these are private to the IMCC subsystem
-IMCC_O_FILES = \
-    compilers/imcc/imcparser$(O) \
-    compilers/imcc/imclexer$(O) \
-    compilers/imcc/imc$(O) \
-    compilers/imcc/main$(O) \
-    compilers/imcc/symreg$(O) \
-    compilers/imcc/instructions$(O) \
-    compilers/imcc/cfg$(O) \
-    compilers/imcc/reg_alloc$(O) \
-    compilers/imcc/sets$(O) \
-    compilers/imcc/debug$(O) \
-    compilers/imcc/optimizer$(O) \
-    compilers/imcc/pbc$(O) \
-    compilers/imcc/parser_util$(O) \
-    compilers/imcc/pcc$(O)
-
-compilers/imcc/pcc$(O) : \
-    compilers/imcc/cfg.h \
-    compilers/imcc/debug.h \
-    compilers/imcc/imc.h \
-    compilers/imcc/imcparser.h \
-    compilers/imcc/instructions.h \
-    compilers/imcc/parser.h \
-    compilers/imcc/sets.h \
-    compilers/imcc/symreg.h \
-    compilers/imcc/unit.h \
-    $(INC_DIR)/oplib/ops.h \
-    $(PARROT_H_HEADERS)
-
-compilers/imcc/instructions$(O) : \
-    compilers/imcc/cfg.h \
-    compilers/imcc/debug.h \
-    compilers/imcc/imc.h \
-    compilers/imcc/instructions.h \
-    compilers/imcc/optimizer.h \
-    compilers/imcc/pbc.h \
-    compilers/imcc/sets.h \
-    compilers/imcc/symreg.h \
-    compilers/imcc/unit.h \
-    $(INC_DIR)/oplib/ops.h \
-    $(PARROT_H_HEADERS)
-
-compilers/imcc/pbc$(O) : \
-    compilers/imcc/cfg.h \
-    compilers/imcc/debug.h \
-    compilers/imcc/imc.h \
-    compilers/imcc/instructions.h \
-    compilers/imcc/pbc.h \
-    compilers/imcc/sets.h \
-    compilers/imcc/symreg.h \
-    compilers/imcc/unit.h \
-    $(INC_DIR)/oplib/ops.h \
-    $(PARROT_H_HEADERS) \
-    include/pmc/pmc_sub.h
-
-compilers/imcc/parser_util$(O) : \
-    compilers/imcc/cfg.h \
-    compilers/imcc/debug.h \
-    compilers/imcc/imc.h \
-    compilers/imcc/imcparser.h \
-    compilers/imcc/instructions.h \
-    compilers/imcc/optimizer.h \
-    compilers/imcc/parser.h \
-    compilers/imcc/pbc.h \
-    compilers/imcc/sets.h \
-    compilers/imcc/symreg.h \
-    compilers/imcc/unit.h \
-    $(INC_DIR)/dynext.h \
-    $(INC_DIR)/embed.h \
-    $(INC_DIR)/oplib/ops.h \
-    $(PARROT_H_HEADERS) \
-    include/pmc/pmc_sub.h
-
-compilers/imcc/imc$(O) : \
-    compilers/imcc/cfg.h \
-    compilers/imcc/debug.h \
-    compilers/imcc/imc.h \
-    compilers/imcc/instructions.h \
-    compilers/imcc/optimizer.h \
-    compilers/imcc/sets.h \
-    compilers/imcc/symreg.h \
-    compilers/imcc/unit.h \
-    $(INC_DIR)/oplib/ops.h \
-    $(PARROT_H_HEADERS)
-
-compilers/imcc/cfg$(O) : \
-    compilers/imcc/cfg.h \
-    compilers/imcc/debug.h \
-    compilers/imcc/imc.h \
-    compilers/imcc/instructions.h \
-    compilers/imcc/optimizer.h \
-    compilers/imcc/sets.h \
-    compilers/imcc/symreg.h \
-    compilers/imcc/unit.h \
-    $(INC_DIR)/oplib/ops.h \
-    $(PARROT_H_HEADERS)
-
-compilers/imcc/debug$(O) : \
-    compilers/imcc/cfg.h \
-    compilers/imcc/debug.h \
-    compilers/imcc/imc.h \
-    compilers/imcc/instructions.h \
-    compilers/imcc/sets.h \
-    compilers/imcc/symreg.h \
-    compilers/imcc/unit.h \
-    $(INC_DIR)/oplib/ops.h \
-    $(PARROT_H_HEADERS)
-
-compilers/imcc/imclexer$(O) : \
-    compilers/imcc/cfg.h \
-    compilers/imcc/debug.h \
-    compilers/imcc/imc.h \
-    compilers/imcc/imcparser.h \
-    compilers/imcc/instructions.h \
-    compilers/imcc/parser.h \
-    compilers/imcc/sets.h \
-    compilers/imcc/symreg.h \
-    compilers/imcc/unit.h \
-    $(INC_DIR)/oplib/ops.h \
-    $(PARROT_H_HEADERS)
-
-compilers/imcc/imcparser$(O) : \
-    compilers/imcc/cfg.h \
-    compilers/imcc/debug.h \
-    compilers/imcc/imc.h \
-    compilers/imcc/imcparser.h \
-    compilers/imcc/instructions.h \
-    compilers/imcc/optimizer.h \
-    compilers/imcc/parser.h \
-    compilers/imcc/pbc.h \
-    compilers/imcc/sets.h \
-    compilers/imcc/symreg.h \
-    compilers/imcc/unit.h \
-    $(INC_DIR)/dynext.h \
-    $(INC_DIR)/oplib/ops.h \
-    $(PARROT_H_HEADERS)
-
-compilers/imcc/main$(O) : \
-    compilers/imcc/cfg.h \
-    compilers/imcc/debug.h \
-    compilers/imcc/imc.h \
-    compilers/imcc/imcparser.h \
-    compilers/imcc/instructions.h \
-    compilers/imcc/parser.h \
-    compilers/imcc/pbc.h \
-    compilers/imcc/sets.h \
-    compilers/imcc/symreg.h \
-    compilers/imcc/unit.h \
-    $(INC_DIR)/embed.h \
-    $(INC_DIR)/imcc.h \
-    $(INC_DIR)/oplib/ops.h \
-    $(INC_DIR)/runcore_api.h \
-    $(PARROT_H_HEADERS)
-
-compilers/imcc/optimizer$(O) : \
-    compilers/imcc/cfg.h \
-    compilers/imcc/debug.h \
-    compilers/imcc/imc.h \
-    compilers/imcc/instructions.h \
-    compilers/imcc/optimizer.h \
-    compilers/imcc/pbc.h \
-    compilers/imcc/sets.h \
-    compilers/imcc/symreg.h \
-    compilers/imcc/unit.h \
-    $(INC_DIR)/oplib/ops.h \
-    $(PARROT_H_HEADERS)
-
-compilers/imcc/reg_alloc$(O) : \
-    compilers/imcc/cfg.h \
-    compilers/imcc/debug.h \
-    compilers/imcc/imc.h \
-    compilers/imcc/instructions.h \
-    compilers/imcc/optimizer.h \
-    compilers/imcc/sets.h \
-    compilers/imcc/symreg.h \
-    compilers/imcc/unit.h \
-    $(INC_DIR)/oplib/ops.h \
-    $(PARROT_H_HEADERS)
-
-compilers/imcc/sets$(O) : \
-    compilers/imcc/cfg.h \
-    compilers/imcc/debug.h \
-    compilers/imcc/imc.h \
-    compilers/imcc/instructions.h \
-    compilers/imcc/sets.h \
-    compilers/imcc/symreg.h \
-    compilers/imcc/unit.h \
-    $(INC_DIR)/oplib/ops.h \
-    $(PARROT_H_HEADERS)
-
-compilers/imcc/symreg$(O) : \
-    compilers/imcc/cfg.h \
-    compilers/imcc/debug.h \
-    compilers/imcc/imc.h \
-    compilers/imcc/instructions.h \
-    compilers/imcc/sets.h \
-    compilers/imcc/symreg.h \
-    compilers/imcc/unit.h \
-    $(INC_DIR)/oplib/ops.h \
-    $(PARROT_H_HEADERS)
-
-# imcc file dependencies
-#
-# The .flag files are needed because we keep some derived files in SVN,
-# which does not keep accurate timestamps on the files, relative to each other.
-# Note that YACC or LEX may be null commands, so we must `touch` all the
-# target files, instead of just the .flag files.
-
-compilers/imcc/imcc.y.flag compilers/imcc/imcparser.c compilers/imcc/imcparser.h : compilers/imcc/imcc.y
-	$(YACC) compilers/imcc/imcc.y -d -o compilers/imcc/imcparser.c
-	$(PERL) $(BUILD_TOOLS_DIR)/fixup_gen_file.pl -noheaderizer compilers/imcc/imcparser.c compilers/imcc/imcc.y
-	$(PERL) $(BUILD_TOOLS_DIR)/fixup_gen_file.pl -noheaderizer compilers/imcc/imcparser.h compilers/imcc/imcc.y
-	$(TOUCH) compilers/imcc/imcc.y.flag compilers/imcc/imcparser.c compilers/imcc/imcparser.h
-
-compilers/imcc/imcc.l.flag compilers/imcc/imclexer.c : compilers/imcc/imcc.l
-	$(LEX) -ocompilers/imcc/imclexer.c compilers/imcc/imcc.l
-	$(TOUCH) compilers/imcc/imcc.l.flag compilers/imcc/imclexer.c
-
-imcc-clean:
-	$(RM_F) \
-    compilers/imcc/core \
-    "compilers/imcc/*$(O)" \
-    compilers/imcc/imcparser.output

Copied and modified: branches/one_make/compilers/imcc/Rules.mak (from r43348, branches/one_make/compilers/imcc/Makefile.mak)
==============================================================================
--- branches/one_make/compilers/imcc/Makefile.mak	Thu Dec 31 20:37:41 2009	(r43348, copy source)
+++ branches/one_make/compilers/imcc/Rules.mak	Fri Jan  1 18:30:36 2010	(r43357)
@@ -1,20 +1,3 @@
-# these are private to the IMCC subsystem
-IMCC_O_FILES = \
-    compilers/imcc/imcparser$(O) \
-    compilers/imcc/imclexer$(O) \
-    compilers/imcc/imc$(O) \
-    compilers/imcc/main$(O) \
-    compilers/imcc/symreg$(O) \
-    compilers/imcc/instructions$(O) \
-    compilers/imcc/cfg$(O) \
-    compilers/imcc/reg_alloc$(O) \
-    compilers/imcc/sets$(O) \
-    compilers/imcc/debug$(O) \
-    compilers/imcc/optimizer$(O) \
-    compilers/imcc/pbc$(O) \
-    compilers/imcc/parser_util$(O) \
-    compilers/imcc/pcc$(O)
-
 compilers/imcc/pcc$(O) : \
     compilers/imcc/cfg.h \
     compilers/imcc/debug.h \

Added: branches/one_make/compilers/json/Defines.mak
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/one_make/compilers/json/Defines.mak	Fri Jan  1 18:30:36 2010	(r43357)
@@ -0,0 +1 @@
+JSON_LIB_PBCS = compilers/json/JSON.pbc

Deleted: branches/one_make/compilers/json/Makefile.mak
==============================================================================
--- branches/one_make/compilers/json/Makefile.mak	Fri Jan  1 18:30:36 2010	(r43356)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,18 +0,0 @@
-JSON_LIB_PBCS: compilers/json/JSON.pbc
-
-compilers/json/JSON.pbc : \
-    $(LIBRARY_DIR)/PGE.pbc \
-    $(LIBRARY_DIR)/PGE/Util.pbc \
-    $(LIBRARY_DIR)/TGE.pbc \
-    compilers/json/JSON/grammar.pbc \
-    compilers/json/JSON/pge2pir.pbc \
-    compilers/json/JSON.pir
-	$(PARROT) -o $@ compilers/json/JSON.pir
-
-compilers/json/JSON/grammar.pir : compilers/json/JSON/grammar.pg \
-    $(LIBRARY_DIR)/PGE/Perl6Grammar.pbc
-	$(PARROT) $(LIBRARY_DIR)/PGE/Perl6Grammar.pbc --output=$@ compilers/json/JSON/grammar.pg
-
-compilers/json/JSON/pge2pir.pir : compilers/json/JSON/pge2pir.tg \
-    $(LIBRARY_DIR)/TGE.pbc
-	$(PARROT) compilers/tge/tgc.pir --output=$@ compilers/json/JSON/pge2pir.tg

Copied and modified: branches/one_make/compilers/json/Rules.mak (from r43348, branches/one_make/compilers/json/Makefile.mak)
==============================================================================
--- branches/one_make/compilers/json/Makefile.mak	Thu Dec 31 20:37:41 2009	(r43348, copy source)
+++ branches/one_make/compilers/json/Rules.mak	Fri Jan  1 18:30:36 2010	(r43357)
@@ -1,5 +1,3 @@
-JSON_LIB_PBCS: compilers/json/JSON.pbc
-
 compilers/json/JSON.pbc : \
     $(LIBRARY_DIR)/PGE.pbc \
     $(LIBRARY_DIR)/PGE/Util.pbc \

Added: branches/one_make/compilers/nqp/Defines.mak
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/one_make/compilers/nqp/Defines.mak	Fri Jan  1 18:30:36 2010	(r43357)
@@ -0,0 +1,14 @@
+NQP_LIB_PBCS = compilers/nqp/nqp.pbc
+
+NQP_SOURCES = \
+    compilers/nqp/nqp.pir \
+    compilers/nqp/src/Grammar.pg \
+    compilers/nqp/src/Grammar/Actions.pir \
+    compilers/nqp/src/builtins.pir \
+    compilers/nqp/src/Grammar_gen.pir
+
+NQP_CLEANUPS = \
+    nqp.pbc \
+    src/Grammar_gen.pir \
+    bootstrap/gen_actions.pir \
+    bootstrap/nqp.pbc

Deleted: branches/one_make/compilers/nqp/Makefile.mak
==============================================================================
--- branches/one_make/compilers/nqp/Makefile.mak	Fri Jan  1 18:30:36 2010	(r43356)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,34 +0,0 @@
-NQP_LIB_PBCS = compilers/nqp/nqp.pbc
-
-NQP_SOURCES = \
-    compilers/nqp/nqp.pir \
-    compilers/nqp/src/Grammar.pg \
-    compilers/nqp/src/Grammar/Actions.pir \
-    compilers/nqp/src/builtins.pir \
-    compilers/nqp/src/Grammar_gen.pir
-
-compilers/nqp/nqp.pbc : $(PARROT) $(NQP_SOURCES) \
-    $(LIBRARY_DIR)/PCT.pbc \
-    $(LIBRARY_DIR)/PGE.pbc
-
-compilers/nqp/src/Grammar_gen.pir : $(PARROT) $(LIBRARY_DIR)/PGE/Perl6Grammar.pir compilers/nqp/src/Grammar.pg $(LIBRARY_DIR)/PCT/HLLCompiler.pbc
-	$(PARROT) $(LIBRARY_DIR)/PGE/Perl6Grammar.pir --output=$@ compilers/nqp/src/Grammar.pg
-
-# Developer target to regnerate bootstrap. Unused?
-nqp-boot: \
-    compilers/nqp/bootstrap/nqp.pir \
-    compilers/nqp/bootstrap/gen_actions.pir
-
-compilers/nqp/bootstrap/gen_actions.pir : $(PARROT) \
-    compilers/nqp/nqp.pbc \
-    compilers/nqp/bootstrap/actions.pm
-	$(PARROT) compilers/nqp/nqp.pbc --output=$@ --target=pir \
-	    compilers/nqp/bootstrap/actions.pm
-
-compilers/nqp/bootstrap/nqp.pbc : $(LIBRARY)/PCT.pbc
-
-NQP_CLEANUPS = \
-    nqp.pbc \
-    src/Grammar_gen.pir \
-    bootstrap/gen_actions.pir \
-    bootstrap/nqp.pbc

Copied and modified: branches/one_make/compilers/nqp/Rules.mak (from r43348, branches/one_make/compilers/nqp/Makefile.mak)
==============================================================================
--- branches/one_make/compilers/nqp/Makefile.mak	Thu Dec 31 20:37:41 2009	(r43348, copy source)
+++ branches/one_make/compilers/nqp/Rules.mak	Fri Jan  1 18:30:36 2010	(r43357)
@@ -1,12 +1,3 @@
-NQP_LIB_PBCS = compilers/nqp/nqp.pbc
-
-NQP_SOURCES = \
-    compilers/nqp/nqp.pir \
-    compilers/nqp/src/Grammar.pg \
-    compilers/nqp/src/Grammar/Actions.pir \
-    compilers/nqp/src/builtins.pir \
-    compilers/nqp/src/Grammar_gen.pir
-
 compilers/nqp/nqp.pbc : $(PARROT) $(NQP_SOURCES) \
     $(LIBRARY_DIR)/PCT.pbc \
     $(LIBRARY_DIR)/PGE.pbc
@@ -26,9 +17,3 @@
 	    compilers/nqp/bootstrap/actions.pm
 
 compilers/nqp/bootstrap/nqp.pbc : $(LIBRARY)/PCT.pbc
-
-NQP_CLEANUPS = \
-    nqp.pbc \
-    src/Grammar_gen.pir \
-    bootstrap/gen_actions.pir \
-    bootstrap/nqp.pbc

Added: branches/one_make/compilers/pct/Defines.mak
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/one_make/compilers/pct/Defines.mak	Fri Jan  1 18:30:36 2010	(r43357)
@@ -0,0 +1,6 @@
+PCT_LIB_PBCS = \
+    $(LIBRARY_DIR)/PCT.pbc \
+    $(LIBRARY_DIR)/PCT/PAST.pbc \
+    $(LIBRARY_DIR)/PCT/Grammar.pbc \
+    $(LIBRARY_DIR)/PCT/HLLCompiler.pbc \
+    $(LIBRARY_DIR)/PCT/Dumper.pbc 

Deleted: branches/one_make/compilers/pct/Makefile.mak
==============================================================================
--- branches/one_make/compilers/pct/Makefile.mak	Fri Jan  1 18:30:36 2010	(r43356)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,39 +0,0 @@
-## XXX does not cover .includes of core .pasm files
-
-PCT_LIB_PBCS = \
-    $(LIBRARY_DIR)/PCT.pbc \
-    $(LIBRARY_DIR)/PCT/PAST.pbc \
-    $(LIBRARY_DIR)/PCT/Grammar.pbc \
-    $(LIBRARY_DIR)/PCT/HLLCompiler.pbc \
-    $(LIBRARY_DIR)/PCT/Dumper.pbc 
-
-$(LIBRARY_DIR)/PCT.pbc : $(PARROT) compilers/pct/PCT.pir \
-    $(LIBRARY_DIR)/PCT/Grammar.pbc $(LIBRARY_DIR)/PCT/PAST.pbc
-	$(PARROT) -o $@ compilers/pct/PCT.pir
-
-$(LIBRARY_DIR)/PCT/PAST.pbc : compilers/pct/src/PAST.pir $(PARROT) \
-    $(LIBRARY_DIR)/PCT/HLLCompiler.pbc \
-    compilers/pct/src/PCT/Node.pir \
-    compilers/pct/src/PAST/Node.pir \
-    compilers/pct/src/PAST/Compiler.pir \
-    compilers/pct/src/POST/Node.pir \
-    compilers/pct/src/POST/Compiler.pir
-	$(PARROT) -o $@ compilers/pct/src/PAST.pir
-
-$(LIBRARY_DIR)/PCT/Grammar.pbc : compilers/pct/src/PCT/Grammar.pir $(PARROT) \
-    $(LIBRARY_DIR)/PGE.pbc $(LIBRARY_DIR)/PGE/Util.pbc
-	$(PARROT) -o $@ compilers/pct/src/PCT/Grammar.pir
-
-$(LIBRARY_DIR)/PCT/HLLCompiler.pbc : compilers/pct/src/PCT/HLLCompiler.pir \
-    $(PARROT) \
-    $(LIBRARY_DIR)/PGE/Dumper.pbc \
-    $(LIBRARY_DIR)/P6object.pbc \
-    $(LIBRARY_DIR)/Parrot/Exception.pbc \
-    $(LIBRARY_DIR)/config.pir \
-    $(LIBRARY_DIR)/Getopt/Obj.pbc \
-    $(LIBRARY_DIR)/dumper.pbc \
-    $(LIBRARY_DIR)/PCT/Dumper.pbc
-	$(PARROT) -o $@ compilers/pct/src/PCT/HLLCompiler.pir
-
-$(LIBRARY_DIR)/PCT/Dumper.pbc : compilers/pct/src/PCT/Dumper.pir $(PARROT)
-	$(PARROT) -o $@ compilers/pct/src/PCT/Dumper.pir

Copied and modified: branches/one_make/compilers/pct/Rules.mak (from r43348, branches/one_make/compilers/pct/Makefile.mak)
==============================================================================
--- branches/one_make/compilers/pct/Makefile.mak	Thu Dec 31 20:37:41 2009	(r43348, copy source)
+++ branches/one_make/compilers/pct/Rules.mak	Fri Jan  1 18:30:36 2010	(r43357)
@@ -1,12 +1,5 @@
 ## XXX does not cover .includes of core .pasm files
 
-PCT_LIB_PBCS = \
-    $(LIBRARY_DIR)/PCT.pbc \
-    $(LIBRARY_DIR)/PCT/PAST.pbc \
-    $(LIBRARY_DIR)/PCT/Grammar.pbc \
-    $(LIBRARY_DIR)/PCT/HLLCompiler.pbc \
-    $(LIBRARY_DIR)/PCT/Dumper.pbc 
-
 $(LIBRARY_DIR)/PCT.pbc : $(PARROT) compilers/pct/PCT.pir \
     $(LIBRARY_DIR)/PCT/Grammar.pbc $(LIBRARY_DIR)/PCT/PAST.pbc
 	$(PARROT) -o $@ compilers/pct/PCT.pir

Added: branches/one_make/compilers/pge/Defines.mak
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/one_make/compilers/pge/Defines.mak	Fri Jan  1 18:30:36 2010	(r43357)
@@ -0,0 +1,2 @@
+PGE_LIB_PBCS = $(LIBRARY_DIR)/PGE.pbc
+PGE_CLEANUPS = $(PGE_LIB_PBCS) compilers/pge/PGE/builtins_gen.pir

Deleted: branches/one_make/compilers/pge/Makefile.mak
==============================================================================
--- branches/one_make/compilers/pge/Makefile.mak	Fri Jan  1 18:30:36 2010	(r43356)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,21 +0,0 @@
-# the default target
-
-PGE_LIB_PBCS = $(LIBRARY_DIR)/PGE.pbc
-
-## Two-stage build that reuses builtins_gen.pir ; use the Perl6Grammar.pir
-## of stage one to avoid a circular dependency.
-
-$(LIBRARY_DIR)/PGE.pbc: $(PARROT) \
-    compilers/pge/PGE.pir \
-    compilers/pge/PGE/Exp.pir \
-    compilers/pge/PGE/Match.pir \
-    compilers/pge/PGE/Regex.pir \
-    compilers/pge/PGE/Perl6Regex.pir \
-    compilers/pge/PGE/OPTable.pir \
-    compilers/pge/PGE/P5Regex.pir \
-    compilers/pge/PGE/builtins.pg \
-    $(LIBRARY_DIR)/PCT/HLLCompiler.pbc
-	$(PERL) -e "" > compilers/pge/PGE/builtins_gen.pir
-	$(PARROT) -o $@ compilers/pge/PGE.pir
-	$(PARROT) $(LIBRARY_DIR)/PGE/Perl6Grammar.pir --output=compilers/pge/PGE/builtins_gen.pir compilers/pge/PGE/builtins.pg
-	$(PARROT) -o $@ compilers/pge/PGE.pir

Copied and modified: branches/one_make/compilers/pge/Rules.mak (from r43348, branches/one_make/compilers/pge/Makefile.mak)
==============================================================================
--- branches/one_make/compilers/pge/Makefile.mak	Thu Dec 31 20:37:41 2009	(r43348, copy source)
+++ branches/one_make/compilers/pge/Rules.mak	Fri Jan  1 18:30:36 2010	(r43357)
@@ -1,10 +1,3 @@
-# the default target
-
-PGE_LIB_PBCS = $(LIBRARY_DIR)/PGE.pbc
-
-## Two-stage build that reuses builtins_gen.pir ; use the Perl6Grammar.pir
-## of stage one to avoid a circular dependency.
-
 $(LIBRARY_DIR)/PGE.pbc: $(PARROT) \
     compilers/pge/PGE.pir \
     compilers/pge/PGE/Exp.pir \
@@ -19,3 +12,4 @@
 	$(PARROT) -o $@ compilers/pge/PGE.pir
 	$(PARROT) $(LIBRARY_DIR)/PGE/Perl6Grammar.pir --output=compilers/pge/PGE/builtins_gen.pir compilers/pge/PGE/builtins.pg
 	$(PARROT) -o $@ compilers/pge/PGE.pir
+

Added: branches/one_make/compilers/tge/Defines.mak
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/one_make/compilers/tge/Defines.mak	Fri Jan  1 18:30:36 2010	(r43357)
@@ -0,0 +1 @@
+TGE_LIB_PBCS = $(LIBRARY_DIR)/TGE.pbc compilers/tge/tgc.pbc

Deleted: branches/one_make/compilers/tge/Makefile.mak
==============================================================================
--- branches/one_make/compilers/tge/Makefile.mak	Fri Jan  1 18:30:36 2010	(r43356)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,20 +0,0 @@
-TGE_LIB_PBCS = $(LIBRARY_DIR)/TGE.pbc compilers/tge/tgc.pbc
-
-$(LIBRARY_DIR)/TGE.pbc:  \
-    $(LIBRARY_DIR)/PGE.pbc \
-    $(LIBRARY_DIR)/PGE/Util.pbc \
-    $(LIBRARY_DIR)/P6object.pbc \
-    compilers/tge/TGE.pir \
-    compilers/tge/TGE/Rule.pir \
-    compilers/tge/TGE/Parser.pir \
-    compilers/tge/TGE/Grammar.pir \
-    compilers/tge/TGE/Compiler.pir \
-    compilers/tge/TGE/Tree.pir
-	$(PARROT) -o $@ compilers/tge/TGE.pir
-
-compilers/tge/tgc.pbc : $(LIBRARY_DIR)/TGE.pbc $(LIBRARY_DIR)/Getopt/Obj.pbc
-
-compilers/tge/TGE/Parser.pir: $(PARROT) \
-    compilers/tge/TGE/Parser.pg \
-    $(LIBRARY_DIR)/PGE/Perl6Grammar.pbc 
-	$(PARROT) $(LIBRARY_DIR)/PGE/Perl6Grammar.pbc --output=$@ compilers/tge/TGE/Parser.pg

Copied and modified: branches/one_make/compilers/tge/Rules.mak (from r43348, branches/one_make/compilers/tge/Makefile.mak)
==============================================================================
--- branches/one_make/compilers/tge/Makefile.mak	Thu Dec 31 20:37:41 2009	(r43348, copy source)
+++ branches/one_make/compilers/tge/Rules.mak	Fri Jan  1 18:30:36 2010	(r43357)
@@ -1,5 +1,3 @@
-TGE_LIB_PBCS = $(LIBRARY_DIR)/TGE.pbc compilers/tge/tgc.pbc
-
 $(LIBRARY_DIR)/TGE.pbc:  \
     $(LIBRARY_DIR)/PGE.pbc \
     $(LIBRARY_DIR)/PGE/Util.pbc \

Modified: branches/one_make/config/gen/makefiles/root.in
==============================================================================
--- branches/one_make/config/gen/makefiles/root.in	Fri Jan  1 17:57:41 2010	(r43356)
+++ branches/one_make/config/gen/makefiles/root.in	Fri Jan  1 18:30:36 2010	(r43357)
@@ -109,6 +109,15 @@
 # generated by config/init/headers.pm
 NONGEN_HEADERS   := @TEMP_nongen_headers@
 
+include compilers/imcc/Defines.mak
+include compilers/tge/Defines.mak
+include compilers/nqp/Defines.mak
+include compilers/pge/Defines.mak
+include compilers/pct/Defines.mak
+include ext/nqp-rx/Defines.mak
+include compilers/data_json/Defines.mak
+include compilers/json/Defines.mak
+
 ###############################################################################
 #
 # CONFIGURE_GENERATED_FILES:
@@ -168,7 +177,6 @@
     CFLAGS \
     compilers/imcc/CFLAGS \
     config_lib.pasm \
-    $(BUILD_TOOLS_DIR)/dynpmc.pl \
     $(BUILD_TOOLS_DIR)/dynoplibs.pl \
     parrot.pc \
     compilers/imcc/imcc.y.flag \
@@ -863,8 +871,6 @@
         src/io/io_private.h \
         include/pmc/pmc_socket.h
 
-include compilers/imcc/Makefile.mak
-
 O_FILES := \
     $(INTERP_O_FILES) \
     $(CHARSET_O_FILES) \
@@ -1904,7 +1910,7 @@
 	$(RM_F) $(FLUID_FILES_1)
 	$(RM_F) $(FLUID_FILES_2)
 	$(RM_RF) lib/Parrot/OpLib
-	$(RM_F) $(NQP_CLEANUPS)
+	$(RM_F) $(NQP_CLEANUPS) $(PGE_CLEANUPS)
 	$(RM_F) pirc$(EXE)
 
 prog-clean :
@@ -2562,14 +2568,15 @@
 malloclist: src/core_pmcs.c
 	$(PERL) $(BUILD_TOOLS_DIR)/headerizer.pl --macro=PARROT_MALLOC $(HEADERIZER_O_FILES)
 
-include runtime/parrot/library/Makefile.mak
-include compilers/nqp/Makefile.mak
-include compilers/pge/Makefile.mak
-include compilers/pct/Makefile.mak
-include compilers/tge/Makefile.mak
-include compilers/data_json/Makefile.mak
-include compilers/json/Makefile.mak
-include ext/nqp-rx/Makefile.mak
+include runtime/parrot/library/Rules.mak
+include compilers/imcc/Rules.mak
+include compilers/nqp/Rules.mak
+include compilers/pge/Rules.mak
+include compilers/pct/Rules.mak
+include compilers/tge/Rules.mak
+include compilers/data_json/Rules.mak
+include compilers/json/Rules.mak
+include ext/nqp-rx/Rules.mak
 
 # Local variables:
 #   mode: makefile

Added: branches/one_make/ext/nqp-rx/Defines.mak
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/one_make/ext/nqp-rx/Defines.mak	Fri Jan  1 18:30:36 2010	(r43357)
@@ -0,0 +1,8 @@
+NQPRX_LIB_PBCS = \
+    $(LIBRARY_DIR)/Regex.pbc \
+    $(LIBRARY_DIR)/HLL.pbc \
+    $(LIBRARY_DIR)/P6Regex.pbc \
+    $(LIBRARY_DIR)/nqp-rx.pbc \
+    $(LIBRARY_DIR)/P6object.pbc \
+    $(LIBRARY_DIR)/PCT/HLLCompiler.pbc \
+    $(LIBRARY_DIR)/PCT/PAST.pbc

Deleted: branches/one_make/ext/nqp-rx/Makefile.mak
==============================================================================
--- branches/one_make/ext/nqp-rx/Makefile.mak	Fri Jan  1 18:30:36 2010	(r43356)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,32 +0,0 @@
-## XXX does not cover .includes of core .pasm files
-
-NQPRX_LIB_PBCS = \
-    $(LIBRARY_DIR)/Regex.pbc \
-    $(LIBRARY_DIR)/HLL.pbc \
-    $(LIBRARY_DIR)/P6Regex.pbc \
-    $(LIBRARY_DIR)/nqp-rx.pbc \
-    $(LIBRARY_DIR)/P6object.pbc \
-    $(LIBRARY_DIR)/PCT/HLLCompiler.pbc \
-    $(LIBRARY_DIR)/PCT/PAST.pbc
-
-$(LIBRARY_DIR)/Regex.pbc: ext/nqp-rx/src/stage0/Regex-s0.pir $(PARROT)
-	$(PARROT) -o $@ ext/nqp-rx/src/stage0/Regex-s0.pir
-
-$(LIBRARY_DIR)/HLL.pbc: ext/nqp-rx/src/stage0/HLL-s0.pir $(PARROT)
-	$(PARROT) -o $@ ext/nqp-rx/src/stage0/HLL-s0.pir
-
-$(LIBRARY_DIR)/P6Regex.pbc: ext/nqp-rx/src/stage0/P6Regex-s0.pir $(PARROT)
-	$(PARROT) -o $@ ext/nqp-rx/src/stage0/P6Regex-s0.pir
-
-$(LIBRARY_DIR)/nqp-rx.pbc: ext/nqp-rx/src/stage0/NQP-s0.pir $(PARROT)
-	$(PARROT) -o $@ ext/nqp-rx/src/stage0/NQP-s0.pir
-
-## TT #1398 - pbc_to_exe cannot generate a specified target file
-parrot-nqp.pbc : $(LIBRARY_DIR)/nqp-rx.pbc
-	$(CP) $(LIBRARY_DIR)/nqp-rx.pbc $@
-
-$(NQP) : $(NQPRX_LIB_PBCS) $(PBC_TO_EXE) parrot-nqp.pbc
-	$(PBC_TO_EXE) parrot-nqp.pbc
-
-$(INSTALLABLENQP) : $(NQPRX_LIB_PBCS) $(SRC_DIR)/install_config$(O) $(PBC_TO_EXE) parrot-nqp.pbc
-	$(PBC_TO_EXE) parrot-nqp.pbc --install

Copied and modified: branches/one_make/ext/nqp-rx/Rules.mak (from r43348, branches/one_make/ext/nqp-rx/Makefile.mak)
==============================================================================
--- branches/one_make/ext/nqp-rx/Makefile.mak	Thu Dec 31 20:37:41 2009	(r43348, copy source)
+++ branches/one_make/ext/nqp-rx/Rules.mak	Fri Jan  1 18:30:36 2010	(r43357)
@@ -1,14 +1,5 @@
 ## XXX does not cover .includes of core .pasm files
 
-NQPRX_LIB_PBCS = \
-    $(LIBRARY_DIR)/Regex.pbc \
-    $(LIBRARY_DIR)/HLL.pbc \
-    $(LIBRARY_DIR)/P6Regex.pbc \
-    $(LIBRARY_DIR)/nqp-rx.pbc \
-    $(LIBRARY_DIR)/P6object.pbc \
-    $(LIBRARY_DIR)/PCT/HLLCompiler.pbc \
-    $(LIBRARY_DIR)/PCT/PAST.pbc
-
 $(LIBRARY_DIR)/Regex.pbc: ext/nqp-rx/src/stage0/Regex-s0.pir $(PARROT)
 	$(PARROT) -o $@ ext/nqp-rx/src/stage0/Regex-s0.pir
 

Deleted: branches/one_make/runtime/parrot/library/Makefile.mak
==============================================================================
--- branches/one_make/runtime/parrot/library/Makefile.mak	Fri Jan  1 18:30:36 2010	(r43356)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,23 +0,0 @@
-# Track static dependencies 
-
-# XXX only a partial mapping.
-
-$(LIBRARY_DIR)/PGE/Hs.pbc : \
-    $(LIBRARY_DIR)/PGE.pbc
-
-$(LIBRARY_DIR)/PGE/Glob.pbc : \
-    $(LIBRARY_DIR)/PGE.pbc \
-    $(LIBRARY_DIR)/PGE/Dumper.pbc
-
-$(LIBRARY_DIR)/PGE/Perl6Grammar.pbc : \
-    $(LIBRARY_DIR)/PGE.pbc \
-    $(LIBRARY_DIR)/PGE/Text.pbc \
-    $(LIBRARY_DIR)/PGE/Util.pbc \
-    $(LIBRARY_DIR)/PCT/HLLCompiler.pbc
-
-$(LIBRARY_DIR)/Tcl/Glob.pbc : \
-    $(LIBRARY_DIR)/PGE.pbc \
-    $(LIBRARY_DIR)/PCT/HLLCompiler.pbc
-
-$(LIBRARY_DIR)/P6Object.pbc : \
-    $(LIBRARY_DIR)/dumper.pbc

Copied: branches/one_make/runtime/parrot/library/Rules.mak (from r43348, branches/one_make/runtime/parrot/library/Makefile.mak)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/one_make/runtime/parrot/library/Rules.mak	Fri Jan  1 18:30:36 2010	(r43357, copy of r43348, branches/one_make/runtime/parrot/library/Makefile.mak)
@@ -0,0 +1,23 @@
+# Track static dependencies 
+
+# XXX only a partial mapping.
+
+$(LIBRARY_DIR)/PGE/Hs.pbc : \
+    $(LIBRARY_DIR)/PGE.pbc
+
+$(LIBRARY_DIR)/PGE/Glob.pbc : \
+    $(LIBRARY_DIR)/PGE.pbc \
+    $(LIBRARY_DIR)/PGE/Dumper.pbc
+
+$(LIBRARY_DIR)/PGE/Perl6Grammar.pbc : \
+    $(LIBRARY_DIR)/PGE.pbc \
+    $(LIBRARY_DIR)/PGE/Text.pbc \
+    $(LIBRARY_DIR)/PGE/Util.pbc \
+    $(LIBRARY_DIR)/PCT/HLLCompiler.pbc
+
+$(LIBRARY_DIR)/Tcl/Glob.pbc : \
+    $(LIBRARY_DIR)/PGE.pbc \
+    $(LIBRARY_DIR)/PCT/HLLCompiler.pbc
+
+$(LIBRARY_DIR)/P6Object.pbc : \
+    $(LIBRARY_DIR)/dumper.pbc


More information about the parrot-commits mailing list