[svn:parrot] r43384 - in branches/one_make: . compilers/imcc compilers/nqp compilers/pirc compilers/pirc/t config/gen config/gen/makefiles
coke at svn.parrot.org
coke at svn.parrot.org
Tue Jan 5 16:53:17 UTC 2010
Author: coke
Date: Tue Jan 5 16:53:15 2010
New Revision: 43384
URL: https://trac.parrot.org/parrot/changeset/43384
Log:
Convert pirc to be include'd instead of recursive.
minor cleanup on nqp & imcc cleanup
Added:
branches/one_make/compilers/pirc/Defines.mak
branches/one_make/compilers/pirc/Rules.mak
Deleted:
branches/one_make/config/gen/makefiles/pirc.in
Modified:
branches/one_make/MANIFEST
branches/one_make/MANIFEST.SKIP
branches/one_make/compilers/imcc/Rules.mak
branches/one_make/compilers/nqp/Defines.mak
branches/one_make/compilers/pirc/ (props changed)
branches/one_make/compilers/pirc/t/basic.t
branches/one_make/compilers/pirc/t/harness
branches/one_make/compilers/pirc/t/heredoc.t
branches/one_make/compilers/pirc/t/macro.t
branches/one_make/compilers/pirc/t/stmts.t
branches/one_make/compilers/pirc/t/subflags.t
branches/one_make/config/gen/makefiles.pm
branches/one_make/config/gen/makefiles/root.in
Modified: branches/one_make/MANIFEST
==============================================================================
--- branches/one_make/MANIFEST Tue Jan 5 16:51:20 2010 (r43383)
+++ branches/one_make/MANIFEST Tue Jan 5 16:53:15 2010 (r43384)
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Sat Jan 2 07:12:12 2010 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Tue Jan 5 00:25:50 2010 UT
#
# See below for documentation on the format of this file.
#
@@ -154,7 +154,9 @@
compilers/pge/README.pod []doc
compilers/pge/Rules.mak [pge]
compilers/pge/STATUS [pge]
+compilers/pirc/Defines.mak [pirc]
compilers/pirc/README.pod []doc
+compilers/pirc/Rules.mak [pirc]
compilers/pirc/TODO [pirc]
compilers/pirc/heredoc/heredocmain.c [pirc]
compilers/pirc/macro/lexer.h [pirc]
@@ -333,7 +335,6 @@
config/gen/makefiles/ext.in []
config/gen/makefiles/parrot_embed_pl.in []
config/gen/makefiles/parrot_pc.in []
-config/gen/makefiles/pirc.in []
config/gen/makefiles/root.in []
config/gen/opengl.pm []
config/gen/parrot_include.pm []
Modified: branches/one_make/MANIFEST.SKIP
==============================================================================
--- branches/one_make/MANIFEST.SKIP Tue Jan 5 16:51:20 2010 (r43383)
+++ branches/one_make/MANIFEST.SKIP Tue Jan 5 16:53:15 2010 (r43384)
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl Sat Jan 2 07:20:10 2010 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Tue Jan 5 00:25:50 2010 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -227,8 +227,6 @@
^compilers/pirc/.*\.obj/
^compilers/pirc/.*\.pbd$
^compilers/pirc/.*\.pbd/
-^compilers/pirc/Makefile$
-^compilers/pirc/Makefile/
^compilers/pirc/pirc$
^compilers/pirc/pirc/
^compilers/pirc/pirc\.exe$
@@ -247,8 +245,8 @@
^compilers/pirc/t/subflags_?\.pir$
^compilers/pirc/t/subflags_?\.pir/
# generated from svn:ignore of 'compilers/tge/'
-^compilers/tge/tge\.pbc$
-^compilers/tge/tge\.pbc/
+^compilers/tge/tgc\.pbc$
+^compilers/tge/tgc\.pbc/
# generated from svn:ignore of 'compilers/tge/TGE/'
^compilers/tge/TGE/Parser\.pir$
^compilers/tge/TGE/Parser\.pir/
Modified: branches/one_make/compilers/imcc/Rules.mak
==============================================================================
--- branches/one_make/compilers/imcc/Rules.mak Tue Jan 5 16:51:20 2010 (r43383)
+++ branches/one_make/compilers/imcc/Rules.mak Tue Jan 5 16:53:15 2010 (r43384)
@@ -199,9 +199,3 @@
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
Modified: branches/one_make/compilers/nqp/Defines.mak
==============================================================================
--- branches/one_make/compilers/nqp/Defines.mak Tue Jan 5 16:51:20 2010 (r43383)
+++ branches/one_make/compilers/nqp/Defines.mak Tue Jan 5 16:53:15 2010 (r43384)
@@ -8,7 +8,7 @@
compilers/nqp/src/Grammar_gen.pir
NQP_CLEANUPS = \
- nqp.pbc \
- src/Grammar_gen.pir \
- bootstrap/gen_actions.pir \
- bootstrap/nqp.pbc
+ compilers/nqp/nqp.pbc \
+ compilers/nqp/src/Grammar_gen.pir \
+ compilers/nqp/bootstrap/gen_actions.pir \
+ compilers/nqp/bootstrap/nqp.pbc
Added: branches/one_make/compilers/pirc/Defines.mak
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/one_make/compilers/pirc/Defines.mak Tue Jan 5 16:53:15 2010 (r43384)
@@ -0,0 +1,18 @@
+PIRC_O_FILES = \
+ compilers/pirc/src/main$(O) \
+ compilers/pirc/src/pirparser$(O) \
+ compilers/pirc/src/pirlexer$(O) \
+ compilers/pirc/src/pircompunit$(O) \
+ compilers/pirc/src/pircompiler$(O) \
+ compilers/pirc/src/pirsymbol$(O) \
+ compilers/pirc/src/piremit$(O) \
+ compilers/pirc/src/hdocprep$(O) \
+ compilers/pirc/src/pirmacro$(O) \
+ compilers/pirc/src/pirregalloc$(O) \
+ compilers/pirc/src/bcgen$(O) \
+ compilers/pirc/src/pirpcc$(O) \
+ compilers/pirc/src/pirerr$(O) \
+ compilers/pirc/src/pircapi$(O) \
+ compilers/pirc/src/pirop$(O)
+
+PIRC_CLEANUPS = $(PIRC_O_FILES) "compilers/pirc/t/*.pir" ./pirc$(EXE)
Added: branches/one_make/compilers/pirc/Rules.mak
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/one_make/compilers/pirc/Rules.mak Tue Jan 5 16:53:15 2010 (r43384)
@@ -0,0 +1,226 @@
+compilers/pirc/src/piremit$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/piremit.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pirerr.h \
+ compilers/pirc/src/bcgen.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/piryy.h \
+ $(INC_DIR)/embed.h \
+ $(INC_DIR)/oplib/ops.h
+
+compilers/pirc/src/pirparser$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirparser.h \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirlexer.h \
+ compilers/pirc/src/pirerr.h \
+ compilers/pirc/src/pirop.h \
+ compilers/pirc/src/pirpcc.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/bcgen.h \
+ $(INC_DIR)/oplib/ops.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/src/pirerr$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirparser.h \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirlexer.h \
+ compilers/pirc/src/pirerr.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/bcgen.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/src/bcgen$(O) : \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/bcgen.h \
+ $(PARROT_H_HEADERS) \
+ $(INC_DIR)/embed.h \
+ include/pmc/pmc_sub.h \
+ include/pmc/pmc_namespace.h
+
+compilers/pirc/src/pirregalloc$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/bcgen.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/heredoc/heredocmain$(O) : $(PARROT_H_HEADERS)
+
+compilers/pirc/macro/macrolexer$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/macro/macro.h \
+ compilers/pirc/macro/lexer.h \
+ compilers/pirc/macro/macroparser.h
+
+compilers/pirc/macro/macroparser$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/macro/macro.h \
+ compilers/pirc/macro/lexer.h \
+ compilers/pirc/macro/macroparser.h \
+ compilers/pirc/macro/macrolexer.h
+
+compilers/pirc/src/hdocprep$(O) : $(PARROT_H_HEADERS) \
+ $(INC_DIR)/embed.h compilers/pirc/src/pirheredoc.h
+
+compilers/pirc/src/main$(O) : \
+ $(PARROT_H_HEADERS) \
+ $(INC_DIR)/embed.h \
+ compilers/pirc/src/bcgen.h \
+ compilers/pirc/src/pirparser.h \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/piremit.h \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirlexer.h \
+ compilers/pirc/src/pirheredoc.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pircapi.h
+
+compilers/pirc/src/pircapi$(O) : \
+ $(PARROT_H_HEADERS) \
+ compilers/pirc/src/bcgen.h \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pirparser.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/piremit.h \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirlexer.h \
+ compilers/pirc/src/pircapi.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/src/pircompiler$(O) : \
+ compilers/pirc/src/pircompiler.h \
+ $(PARROT_H_HEADERS) \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirerr.h \
+ compilers/pirc/src/bcgen.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/pirdefines.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/src/pircompunit$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirpcc.h \
+ compilers/pirc/src/pirerr.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pirop.h \
+ compilers/pirc/src/bcgen.h \
+ $(INC_DIR)/oplib/ops.h \
+ $(INC_DIR)/dynext.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/src/pirlexer$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/pirparser.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pirerr.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/bcgen.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/src/pirmacro$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/bcgen.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/src/pirop$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirop.h \
+ compilers/pirc/src/pirerr.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/bcgen.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/src/pirpcc$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/pirpcc.h \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pirerr.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/bcgen.h \
+ $(INC_DIR)/oplib/ops.h \
+ $(INC_DIR)/embed.h
+
+compilers/pirc/src/pirsymbol$(O) : $(PARROT_H_HEADERS) \
+ compilers/pirc/src/pircompiler.h \
+ compilers/pirc/src/pirsymbol.h \
+ compilers/pirc/src/piryy.h \
+ compilers/pirc/src/pirerr.h \
+ compilers/pirc/src/pircompunit.h \
+ compilers/pirc/src/pirdefines.h \
+ compilers/pirc/src/pirregalloc.h \
+ compilers/pirc/src/pirmacro.h \
+ compilers/pirc/src/bcgen.h \
+ $(INC_DIR)/embed.h
+
+# the all here is too broad, but the separate pirc.exe is going away soonish.
+pirc$(EXE): $(PIRC_O_FILES) all
+ $(LINK) $(LD_OUT) $@ \
+ $(PIRC_O_FILES) \
+ $(RPATH_BLIB) $(ALL_PARROT_LIBS) $(C_LIBS) $(LINKFLAGS) $(LINK_DYNAMIC)
+#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
+
+compilers/pirc/src/pir.y.flag compilers/pirc/src/pirparser.c compilers/pirc/src/pirparser.h : compilers/pirc/src/pir.y
+ $(YACC) compilers/pirc/src/pir.y -d -o compilers/pirc/src/pirparser.c
+ $(TOUCH) compilers/pirc/src/pir.y.flag compilers/pirc/src/pirparser.c compilers/pirc/src/pirparser.h
+
+compilers/pirc/src/pir.l.flag compilers/pirc/src/pirlexer.c : compilers/pirc/src/pir.l
+ $(LEX) -o compilers/pirc/src/pirlexer.c compilers/pirc/src/pir.l
+ $(TOUCH) compilers/pirc/src/pir.l.flag compilers/pirc/src/pirlexer.c
+
+# XXX This should eventually be combined with the standard parrot test suite.
+pirc-test: all
+ $(PERL) compilers/pirc/t/harness
Modified: branches/one_make/compilers/pirc/t/basic.t
==============================================================================
--- branches/one_make/compilers/pirc/t/basic.t Tue Jan 5 16:51:20 2010 (r43383)
+++ branches/one_make/compilers/pirc/t/basic.t Tue Jan 5 16:53:15 2010 (r43384)
@@ -2,7 +2,7 @@
# Copyright (C) 2008-2009, Parrot Foundation.
# $Id$
-use lib "../../lib";
+use lib qw(lib);
use Parrot::Test tests => 6;
pirc_2_pasm_is(<<'CODE', <<'OUTPUT', "a local, a reg and an if-stat");
Modified: branches/one_make/compilers/pirc/t/harness
==============================================================================
--- branches/one_make/compilers/pirc/t/harness Tue Jan 5 16:51:20 2010 (r43383)
+++ branches/one_make/compilers/pirc/t/harness Tue Jan 5 16:53:15 2010 (r43384)
@@ -5,11 +5,11 @@
use strict;
use warnings;
-use lib '../../lib';
+use lib qw(lib);
use Test::Harness;
-my @tests = @ARGV ? @ARGV : <t/*.t>;
+my @tests = @ARGV ? @ARGV : <compilers/pirc/t/*.t>;
eval { require TAP::Harness };
if ($@) {
Modified: branches/one_make/compilers/pirc/t/heredoc.t
==============================================================================
--- branches/one_make/compilers/pirc/t/heredoc.t Tue Jan 5 16:51:20 2010 (r43383)
+++ branches/one_make/compilers/pirc/t/heredoc.t Tue Jan 5 16:53:15 2010 (r43384)
@@ -2,7 +2,7 @@
# Copyright (C) 2008-2009, Parrot Foundation.
# $Id$
-use lib "../../lib";
+use lib qw(lib);
use Parrot::Test tests => 1;
pirc_2_pasm_is(<<'CODE', <<'OUTPUT', "a single const declaration");
Modified: branches/one_make/compilers/pirc/t/macro.t
==============================================================================
--- branches/one_make/compilers/pirc/t/macro.t Tue Jan 5 16:51:20 2010 (r43383)
+++ branches/one_make/compilers/pirc/t/macro.t Tue Jan 5 16:53:15 2010 (r43384)
@@ -2,7 +2,7 @@
# Copyright (C) 2008-2009, Parrot Foundation.
# $Id$
-use lib "../../lib";
+use lib qw(lib);
use Parrot::Test tests => 1;
pirc_2_pasm_is(<<'CODE', <<'OUTPUT', "a single const declaration");
Modified: branches/one_make/compilers/pirc/t/stmts.t
==============================================================================
--- branches/one_make/compilers/pirc/t/stmts.t Tue Jan 5 16:51:20 2010 (r43383)
+++ branches/one_make/compilers/pirc/t/stmts.t Tue Jan 5 16:53:15 2010 (r43384)
@@ -2,7 +2,7 @@
# Copyright (C) 2008-2009, Parrot Foundation.
# $Id$
-use lib "../../lib";
+use lib qw(lib);
use Parrot::Test tests => 5;
pirc_2_pasm_is(<<'CODE', <<'OUTPUT', "a simple sub call - no params");
Modified: branches/one_make/compilers/pirc/t/subflags.t
==============================================================================
--- branches/one_make/compilers/pirc/t/subflags.t Tue Jan 5 16:51:20 2010 (r43383)
+++ branches/one_make/compilers/pirc/t/subflags.t Tue Jan 5 16:53:15 2010 (r43384)
@@ -2,7 +2,7 @@
# Copyright (C) 2008-2009, Parrot Foundation.
# $Id$
-use lib "../../lib";
+use lib qw(lib);
use Parrot::Test tests => 1;
pirc_2_pasm_is(<<'CODE', <<'OUTPUT', "a single const declaration");
Modified: branches/one_make/config/gen/makefiles.pm
==============================================================================
--- branches/one_make/config/gen/makefiles.pm Tue Jan 5 16:51:20 2010 (r43383)
+++ branches/one_make/config/gen/makefiles.pm Tue Jan 5 16:53:15 2010 (r43384)
@@ -38,8 +38,6 @@
'compilers/ncigen/Makefile' =>
{ SOURCE => 'compilers/ncigen/config/makefiles/ncigen.in' },
- 'compilers/pirc/Makefile' =>
- { SOURCE => 'config/gen/makefiles/pirc.in' },
'src/dynpmc/Makefile' =>
{ SOURCE => 'config/gen/makefiles/dynpmc.in' },
'src/dynoplibs/Makefile' =>
Deleted: branches/one_make/config/gen/makefiles/pirc.in
==============================================================================
--- branches/one_make/config/gen/makefiles/pirc.in Tue Jan 5 16:53:15 2010 (r43383)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,126 +0,0 @@
-# Copyright (C) 2007-2009, Parrot Foundation.
-# $Id$
-
-.SUFFIXES : .c @o@
-
-# Setup some commands
-PERL := @perl@
-RM_F := @rm_f@
-CP := @cp@
-PARROT := ../../parrot at exe@
-BUILD_DIR := @build_dir@
-RECONFIGURE := $(PERL) @build_dir@/tools/dev/reconfigure.pl
-
-CC := @cc@
-O := @o@
-EXE := @exe@
-CC_INC := -I../../include -I../../include/pmc
-C_LIBS := @libs@
-CC_SHARED := @cc_shared@
-CFLAGS := $(CC_INC) @ccflags@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@ $(CC_SHARED)
-LINK_DYNAMIC := @link_dynamic@
-LINK := @link@
-LINKFLAGS := @linkflags@ @link_debug@ @ld_debug@
-LD := @ld@
-LDFLAGS := @ldflags@ @ld_debug@
-TOUCH := @touch@
-LEX := @lex@
-YACC := @yacc@
-
-SOURCES := \
- src/main.c \
- src/pirparser.c \
- src/pirlexer.c \
- src/pircompunit.c \
- src/pircompiler.c \
- src/pirsymbol.c \
- src/piremit.c \
- src/hdocprep.c \
- src/pirmacro.c \
- src/pirregalloc.c \
- src/bcgen.c \
- src/pirerr.c \
- src/pircapi.c \
- src/pirop.c
-
-OBJS := \
- src/main$(O) \
- src/pirparser$(O) \
- src/pirlexer$(O) \
- src/pircompunit$(O) \
- src/pircompiler$(O) \
- src/pirsymbol$(O) \
- src/piremit$(O) \
- src/hdocprep$(O) \
- src/pirmacro$(O) \
- src/pirregalloc$(O) \
- src/bcgen$(O) \
- src/pirpcc$(O) \
- src/pirerr$(O) \
- src/pircapi$(O) \
- src/pirop$(O)
-
-.c$(O) : # suffix rule (limited support)
- @$(PERL) ../../tools/dev/cc_flags.pl -v ../../CFLAGS $(CC) "" $(CFLAGS) -I$(@D) @cc_o_out@$@ -c $<
-
-
-# the default target
-all: pirc$(EXE)
-
-
-pirc$(EXE): $(OBJS)
- $(LINK) @ld_out@$@ \
- $(OBJS) \
- @rpath_blib@ @libparrot_linkflags@ $(C_LIBS) $(LINKFLAGS) $(LINK_DYNAMIC)
-#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
-
-src/pir.y.flag src/pirparser.c src/pirparser.h : src/pir.y
- cd src && $(YACC) pir.y -d -o pirparser.c
- #$(PERL) $(BUILD_TOOLS_DIR)/fixup_gen_file.pl -noheaderizer src/pirparser.c src/pir.y
- #$(PERL) $(BUILD_TOOLS_DIR)/fixup_gen_file.pl -noheaderizer src/pirparser.h src/pir.y
- $(TOUCH) src/pir.y.flag src/pirparser.c src/pirparser.h
-
-src/pir.l.flag src/pirlexer.c : src/pir.l
- cd src && $(LEX) -opirlexer.c pir.l
- $(TOUCH) src/pir.l.flag src/pirlexer.c
-
-
-src/pirparser$(O): src/pirparser.c src/pirparser.h
-src/pirlexer$(O): src/pirlexer.c src/pirlexer.h
-src/pircompunit$(O): src/pircompunit.c src/pircompunit.h
-src/pircompiler$(O): src/pircompiler.c src/pircompiler.h
-src/pirsymbol$(O): src/pirsymbol.c src/pirsymbol.h
-src/piremit$(O): src/piremit.c src/piremit.h
-src/hdocprep$(O): src/hdocprep.c src/hdocprep.l
-src/pirmacro$(O): src/pirmacro.c src/pirmacro.h
-src/pirregalloc$(O): src/pirregalloc.c src/pirregalloc.h
-src/bcgen$(O): src/bcgen.c src/bcgen.h
-src/pirpcc$(O): src/pirpcc.c src/pirpcc.h
-src/pirerr$(O): src/pirerr.c src/pirerr.h
-src/pircapi$(O): src/pircapi.c src/pircapi.h
-src/pirop$(O): src/pirop.c src/pirop.h
-
-test: all
- perl t/harness
-
-# regenerate the Makefile
-Makefile: $(BUILD_DIR)/config/gen/makefiles/pirc.in
- cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::makefiles --target=compilers/pirc/Makefile
-
-
-clean:
- $(RM_F) *$(O)
- $(RM_F) $(OBJS)
- $(RM_F) pirc$(EXE)
-
-realclean: clean
- $(RM_F) \
- Makefile \
- doc/*.html
-
-distclean: realclean
-
-# Local variables:
-# mode: makefile
-# End:
-# vim: ft=make:
Modified: branches/one_make/config/gen/makefiles/root.in
==============================================================================
--- branches/one_make/config/gen/makefiles/root.in Tue Jan 5 16:51:20 2010 (r43383)
+++ branches/one_make/config/gen/makefiles/root.in Tue Jan 5 16:53:15 2010 (r43384)
@@ -87,9 +87,11 @@
LINK := @link@
LINKFLAGS := @linkflags@ @link_debug@ @ld_debug@
LD := @ld@
+LD_OUT := @ld_out@
LDFLAGS := @ldflags@ @ld_debug@
INNO_SETUP := iscc
TEMPDIR := @tempdir@
+RPATH_BLIB := @rpath_blib@
#IF(darwin):export MACOSX_DEPLOYMENT_TARGET := @osx_version@
###############################################################################
@@ -110,6 +112,7 @@
NONGEN_HEADERS := @TEMP_nongen_headers@
include compilers/imcc/Defines.mak
+include compilers/pirc/Defines.mak
include compilers/tge/Defines.mak
include compilers/nqp/Defines.mak
include compilers/pge/Defines.mak
@@ -320,13 +323,6 @@
#
###############################################################################
-# these are private to the PIRC subsystem
-PIRC_O_FILES := \
- compilers/pirc/src/bcgen$(O) \
- compilers/pirc/src/pircapi$(O) \
- compilers/pirc/src/pirerr$(O) \
- compilers/pirc/src/pirop$(O)
-
# parrot.h and all the includes it causes to be included
PARROT_H_HEADERS := \
$(INC_DIR)/parrot.h \
@@ -803,13 +799,6 @@
$(PARROT) -o parrot_config.pbc tools/util/parrot-config.pir
$(PARROT) pbc_to_exe.pbc parrot_config.pbc
-#IF(win32):pirc : $(PIRC)
-
-$(PIRC) : $(PARROT)
- $(MAKE) compilers/pirc
- $(CP) compilers/pirc/pirc$(EXE) $(PIRC)
- $(CHMOD) 0755 $(PIRC)
-
$(MINIPARROT) : src/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
lib/Parrot/OpLib/core.pm src/null_config$(O)
$(LINK) @ld_out@$@ src/main$(O) src/null_config$(O) \
@@ -1322,220 +1311,12 @@
src/io/filehandle$(O) : $(PARROT_H_HEADERS) include/pmc/pmc_filehandle.h src/io/io_private.h
-compilers/pirc/src/piremit$(O) : $(PARROT_H_HEADERS) \
- compilers/pirc/src/piremit.h \
- compilers/pirc/src/pircompunit.h \
- compilers/pirc/src/pircompiler.h \
- compilers/pirc/src/pirerr.h \
- compilers/pirc/src/bcgen.h \
- compilers/pirc/src/pirdefines.h \
- compilers/pirc/src/pirmacro.h \
- compilers/pirc/src/pirregalloc.h \
- compilers/pirc/src/pirsymbol.h \
- compilers/pirc/src/piryy.h \
- $(INC_DIR)/embed.h \
- $(INC_DIR)/oplib/ops.h
-
src/dynpmc/subproxy$(O) : $(PARROT_H_HEADERS) $(INC_DIR)/extend.h \
$(INC_DIR)/dynext.h include/pmc/pmc_subproxy.h \
include/pmc/pmc_sub.h include/pmc_default.h \
include/pmc/pmc_continuation.h include/pmc/pmc_callcontext.h \
include/pmc/pmc_default.h
-compilers/pirc/src/pirparser$(O) : $(PARROT_H_HEADERS) \
- compilers/pirc/src/pircompiler.h \
- compilers/pirc/src/pircompunit.h \
- compilers/pirc/src/pirdefines.h \
- compilers/pirc/src/pirparser.h \
- compilers/pirc/src/piryy.h \
- compilers/pirc/src/pirlexer.h \
- compilers/pirc/src/pirerr.h \
- compilers/pirc/src/pirop.h \
- compilers/pirc/src/pirpcc.h \
- compilers/pirc/src/pirmacro.h \
- compilers/pirc/src/pirregalloc.h \
- compilers/pirc/src/pirsymbol.h \
- compilers/pirc/src/bcgen.h \
- $(INC_DIR)/oplib/ops.h \
- $(INC_DIR)/embed.h
-
-compilers/pirc/src/pirerr$(O) : $(PARROT_H_HEADERS) \
- compilers/pirc/src/pircompiler.h \
- compilers/pirc/src/pircompunit.h \
- compilers/pirc/src/pirdefines.h \
- compilers/pirc/src/pirparser.h \
- compilers/pirc/src/piryy.h \
- compilers/pirc/src/pirlexer.h \
- compilers/pirc/src/pirerr.h \
- compilers/pirc/src/pirmacro.h \
- compilers/pirc/src/pirregalloc.h \
- compilers/pirc/src/pirsymbol.h \
- compilers/pirc/src/bcgen.h \
- $(INC_DIR)/embed.h
-
-compilers/pirc/src/bcgen$(O) : \
- compilers/pirc/src/pirsymbol.h \
- compilers/pirc/src/pircompiler.h \
- compilers/pirc/src/pirregalloc.h \
- compilers/pirc/src/pircompunit.h \
- compilers/pirc/src/pirdefines.h \
- compilers/pirc/src/pirmacro.h \
- compilers/pirc/src/bcgen.h \
- $(PARROT_H_HEADERS) \
- $(INC_DIR)/embed.h \
- include/pmc/pmc_sub.h \
- include/pmc/pmc_namespace.h
-
-compilers/pirc/src/pirregalloc$(O) : $(PARROT_H_HEADERS) \
- compilers/pirc/src/pircompiler.h \
- compilers/pirc/src/pircompunit.h \
- compilers/pirc/src/pirdefines.h \
- compilers/pirc/src/pirmacro.h \
- compilers/pirc/src/pirregalloc.h \
- compilers/pirc/src/pirsymbol.h \
- compilers/pirc/src/bcgen.h \
- $(INC_DIR)/embed.h
-
-compilers/pirc/heredoc/heredocmain$(O) : $(PARROT_H_HEADERS)
-
-compilers/pirc/macro/macrolexer$(O) : $(PARROT_H_HEADERS) \
- compilers/pirc/macro/macro.h \
- compilers/pirc/macro/lexer.h \
- compilers/pirc/macro/macroparser.h
-
-compilers/pirc/macro/macroparser$(O) : $(PARROT_H_HEADERS) \
- compilers/pirc/macro/macro.h \
- compilers/pirc/macro/lexer.h \
- compilers/pirc/macro/macroparser.h \
- compilers/pirc/macro/macrolexer.h
-
-compilers/pirc/src/hdocprep$(O) : $(PARROT_H_HEADERS) \
- $(INC_DIR)/embed.h compilers/pirc/src/pirheredoc.h
-
-compilers/pirc/src/main$(O) : \
- $(PARROT_H_HEADERS) \
- $(INC_DIR)/embed.h \
- compilers/pirc/src/bcgen.h \
- compilers/pirc/src/pirparser.h \
- compilers/pirc/src/pircompiler.h \
- compilers/pirc/src/pircompunit.h \
- compilers/pirc/src/pirmacro.h \
- compilers/pirc/src/pirdefines.h \
- compilers/pirc/src/piremit.h \
- compilers/pirc/src/piryy.h \
- compilers/pirc/src/pirlexer.h \
- compilers/pirc/src/pirheredoc.h \
- compilers/pirc/src/pirsymbol.h \
- compilers/pirc/src/pirregalloc.h \
- compilers/pirc/src/pircapi.h
-
-compilers/pirc/src/pircapi$(O) : \
- $(PARROT_H_HEADERS) \
- compilers/pirc/src/bcgen.h \
- compilers/pirc/src/pircompiler.h \
- compilers/pirc/src/pirparser.h \
- compilers/pirc/src/pircompunit.h \
- compilers/pirc/src/pirsymbol.h \
- compilers/pirc/src/pirregalloc.h \
- compilers/pirc/src/pirmacro.h \
- compilers/pirc/src/pirdefines.h \
- compilers/pirc/src/piremit.h \
- compilers/pirc/src/piryy.h \
- compilers/pirc/src/pirlexer.h \
- compilers/pirc/src/pircapi.h \
- $(INC_DIR)/embed.h
-
-compilers/pirc/src/pircompiler$(O) : \
- compilers/pirc/src/pircompiler.h \
- $(PARROT_H_HEADERS) \
- compilers/pirc/src/piryy.h \
- compilers/pirc/src/pirmacro.h \
- compilers/pirc/src/pirregalloc.h \
- compilers/pirc/src/pirerr.h \
- compilers/pirc/src/bcgen.h \
- compilers/pirc/src/pircompunit.h \
- compilers/pirc/src/pirsymbol.h \
- compilers/pirc/src/pirdefines.h \
- $(INC_DIR)/embed.h
-
-compilers/pirc/src/pircompunit$(O) : $(PARROT_H_HEADERS) \
- compilers/pirc/src/pircompunit.h \
- compilers/pirc/src/pircompiler.h \
- compilers/pirc/src/pirsymbol.h \
- compilers/pirc/src/piryy.h \
- compilers/pirc/src/pirdefines.h \
- compilers/pirc/src/pirregalloc.h \
- compilers/pirc/src/pirpcc.h \
- compilers/pirc/src/pirerr.h \
- compilers/pirc/src/pirmacro.h \
- compilers/pirc/src/pirop.h \
- compilers/pirc/src/bcgen.h \
- $(INC_DIR)/oplib/ops.h \
- $(INC_DIR)/dynext.h \
- $(INC_DIR)/embed.h
-
-compilers/pirc/src/pirlexer$(O) : $(PARROT_H_HEADERS) \
- compilers/pirc/src/pirparser.h \
- compilers/pirc/src/pirmacro.h \
- compilers/pirc/src/pirerr.h \
- compilers/pirc/src/pircompunit.h \
- compilers/pirc/src/pircompiler.h \
- compilers/pirc/src/pirsymbol.h \
- compilers/pirc/src/piryy.h \
- compilers/pirc/src/pirdefines.h \
- compilers/pirc/src/pirregalloc.h \
- compilers/pirc/src/bcgen.h \
- $(INC_DIR)/embed.h
-
-compilers/pirc/src/pirmacro$(O) : $(PARROT_H_HEADERS) \
- compilers/pirc/src/pirmacro.h \
- compilers/pirc/src/pircompunit.h \
- compilers/pirc/src/pircompiler.h \
- compilers/pirc/src/pirsymbol.h \
- compilers/pirc/src/pirdefines.h \
- compilers/pirc/src/pirregalloc.h \
- compilers/pirc/src/bcgen.h \
- $(INC_DIR)/embed.h
-
-compilers/pirc/src/pirop$(O) : $(PARROT_H_HEADERS) \
- compilers/pirc/src/pircompiler.h \
- compilers/pirc/src/pircompunit.h \
- compilers/pirc/src/pirop.h \
- compilers/pirc/src/pirerr.h \
- compilers/pirc/src/pirsymbol.h \
- compilers/pirc/src/piryy.h \
- compilers/pirc/src/pirdefines.h \
- compilers/pirc/src/pirregalloc.h \
- compilers/pirc/src/pirmacro.h \
- compilers/pirc/src/bcgen.h \
- $(INC_DIR)/embed.h
-
-compilers/pirc/src/pirpcc$(O) : $(PARROT_H_HEADERS) \
- compilers/pirc/src/pirpcc.h \
- compilers/pirc/src/pircompiler.h \
- compilers/pirc/src/pirerr.h \
- compilers/pirc/src/pircompunit.h \
- compilers/pirc/src/pirsymbol.h \
- compilers/pirc/src/piryy.h \
- compilers/pirc/src/pirdefines.h \
- compilers/pirc/src/pirregalloc.h \
- compilers/pirc/src/pirmacro.h \
- compilers/pirc/src/bcgen.h \
- $(INC_DIR)/oplib/ops.h \
- $(INC_DIR)/embed.h
-
-compilers/pirc/src/pirsymbol$(O) : $(PARROT_H_HEADERS) \
- compilers/pirc/src/pircompiler.h \
- compilers/pirc/src/pirsymbol.h \
- compilers/pirc/src/piryy.h \
- compilers/pirc/src/pirerr.h \
- compilers/pirc/src/pircompunit.h \
- compilers/pirc/src/pirdefines.h \
- compilers/pirc/src/pirregalloc.h \
- compilers/pirc/src/pirmacro.h \
- compilers/pirc/src/bcgen.h \
- $(INC_DIR)/embed.h
-
src/gc/malloc_trace$(O) : src/gc/malloc.c
src/packfile/pf_items$(O) : $(PARROT_H_HEADERS)
@@ -1672,9 +1453,6 @@
#
###############################################################################
-compilers-clean :
- $(MAKE) compilers/pirc clean
-
ext-clean:
$(RM_RF) $(NQPRX_LIB_PBCS) parrot-nqp*
@@ -1899,8 +1677,6 @@
dynpmc-clean \
dynoplibs-clean \
examples-clean \
- imcc-clean \
- compilers-clean \
ext-clean \
#UNLESS(win32): cover-clean \
editor-clean
@@ -1910,7 +1686,7 @@
$(RM_F) $(FLUID_FILES_2)
$(RM_RF) lib/Parrot/OpLib
$(RM_F) $(NQP_CLEANUPS) $(PGE_CLEANUPS) $(TGE_CLEANUPS) $(JSON_CLEANUPS)
- $(RM_F) pirc$(EXE)
+ $(RM_F) $(PIRC_CLEANUPS)
prog-clean :
$(RM_F) \
@@ -2050,7 +1826,6 @@
# a failing step of cleaning, usually doesn't concern the following steps
realclean : clean
- -$(MAKE) compilers/pirc realclean
$(RM_RF) \
$(CONFIGURE_GENERATED_FILES) \
blib \
@@ -2569,6 +2344,7 @@
include runtime/parrot/library/Rules.mak
include compilers/imcc/Rules.mak
+include compilers/pirc/Rules.mak
include compilers/nqp/Rules.mak
include compilers/pge/Rules.mak
include compilers/pct/Rules.mak
More information about the parrot-commits
mailing list