[svn:parrot] r43330 - in branches/one_make: compilers/imcc config/auto config/gen/makefiles lib/Parrot/Configure
coke at svn.parrot.org
coke at svn.parrot.org
Thu Dec 31 00:58:05 UTC 2009
Author: coke
Date: Thu Dec 31 00:58:05 2009
New Revision: 43330
URL: https://trac.parrot.org/parrot/changeset/43330
Log:
Eliminate some makefile variables in favor of just specifying paths.,
Remove one config-set make var in the process.
Modified:
branches/one_make/compilers/imcc/Makefile.mak
branches/one_make/config/auto/cgoto.pm
branches/one_make/config/auto/gc.pm
branches/one_make/config/auto/pmc.pm
branches/one_make/config/gen/makefiles/editor.in
branches/one_make/config/gen/makefiles/root.in
branches/one_make/lib/Parrot/Configure/Compiler.pm
Modified: branches/one_make/compilers/imcc/Makefile.mak
==============================================================================
--- branches/one_make/compilers/imcc/Makefile.mak Thu Dec 31 00:56:11 2009 (r43329)
+++ branches/one_make/compilers/imcc/Makefile.mak Thu Dec 31 00:58:05 2009 (r43330)
@@ -52,7 +52,7 @@
compilers/imcc/unit.h \
$(INC_DIR)/oplib/ops.h \
$(PARROT_H_HEADERS) \
- $(PMC_INC_DIR)/pmc/pmc_sub.h
+ include/pmc/pmc_sub.h
compilers/imcc/parser_util$(O) : \
compilers/imcc/cfg.h \
@@ -70,7 +70,7 @@
$(INC_DIR)/embed.h \
$(INC_DIR)/oplib/ops.h \
$(PARROT_H_HEADERS) \
- $(PMC_INC_DIR)/pmc/pmc_sub.h
+ include/pmc/pmc_sub.h
compilers/imcc/imc$(O) : \
compilers/imcc/cfg.h \
Modified: branches/one_make/config/auto/cgoto.pm
==============================================================================
--- branches/one_make/config/auto/cgoto.pm Thu Dec 31 00:56:11 2009 (r43329)
+++ branches/one_make/config/auto/cgoto.pm Thu Dec 31 00:58:05 2009 (r43330)
@@ -62,25 +62,25 @@
TEMP_cg_c => <<'EOF',
# generated by config/auto/cgoto.pm
-$(OPS_DIR)/core_ops_cg$(O): $(GENERAL_H_FILES) $(OPS_DIR)/core_ops_cg.c \
- $(PMC_INC_DIR)/pmc/pmc_parrotlibrary.h
-$(OPS_DIR)/core_ops_cgp$(O): $(GENERAL_H_FILES) $(OPS_DIR)/core_ops_cgp.c \
- $(PMC_INC_DIR)/pmc/pmc_parrotlibrary.h
-$(SRC_DIR)/runcore/cores.c: $(INC_DIR)/oplib/core_ops_cgp.h
+src/ops/core_ops_cg$(O): $(GENERAL_H_FILES) src/ops/core_ops_cg.c \
+ include/pmc/pmc_parrotlibrary.h
+src/ops/core_ops_cgp$(O): $(GENERAL_H_FILES) src/ops/core_ops_cgp.c \
+ include/pmc/pmc_parrotlibrary.h
+src/runcore/cores.c: $(INC_DIR)/oplib/core_ops_cgp.h
-$(INC_DIR)/oplib/core_ops_cg.h: $(OPS_DIR)/core_ops_cg.c
+$(INC_DIR)/oplib/core_ops_cg.h: src/ops/core_ops_cg.c
-$(OPS_DIR)/core_ops_cg.c : $(OPS_FILES) $(BUILD_TOOLS_DIR)/ops2c.pl lib/Parrot/OpsFile.pm lib/Parrot/Op.pm lib/Parrot/OpTrans/CGoto.pm lib/Parrot/OpLib/core.pm
+src/ops/core_ops_cg.c : $(OPS_FILES) $(BUILD_TOOLS_DIR)/ops2c.pl lib/Parrot/OpsFile.pm lib/Parrot/Op.pm lib/Parrot/OpTrans/CGoto.pm lib/Parrot/OpLib/core.pm
$(PERL) $(BUILD_TOOLS_DIR)/ops2c.pl CGoto --core
-$(INC_DIR)/oplib/core_ops_cgp.h: $(OPS_DIR)/core_ops_cgp.c
+$(INC_DIR)/oplib/core_ops_cgp.h: src/ops/core_ops_cgp.c
-$(OPS_DIR)/core_ops_cgp.c : $(OPS_FILES) $(BUILD_TOOLS_DIR)/ops2c.pl lib/Parrot/OpsFile.pm lib/Parrot/Op.pm lib/Parrot/OpTrans/CGP.pm lib/Parrot/OpLib/core.pm lib/Parrot/OpTrans/CPrederef.pm
+src/ops/core_ops_cgp.c : $(OPS_FILES) $(BUILD_TOOLS_DIR)/ops2c.pl lib/Parrot/OpsFile.pm lib/Parrot/Op.pm lib/Parrot/OpTrans/CGP.pm lib/Parrot/OpLib/core.pm lib/Parrot/OpTrans/CPrederef.pm
$(PERL) $(BUILD_TOOLS_DIR)/ops2c.pl CGP --core
EOF
- TEMP_cg_o => '$(OPS_DIR)/core_ops_cg$(O) $(OPS_DIR)/core_ops_cgp$(O)',
- TEMP_cg_r => '$(RM_F) $(INC_DIR)/oplib/core_ops_cg.h $(OPS_DIR)/core_ops_cg.c \
- $(INC_DIR)/oplib/core_ops_cgp.h $(OPS_DIR)/core_ops_cgp.c',
+ TEMP_cg_o => 'src/ops/core_ops_cg$(O) src/ops/core_ops_cgp$(O)',
+ TEMP_cg_r => '$(RM_F) $(INC_DIR)/oplib/core_ops_cg.h src/ops/core_ops_cg.c \
+ $(INC_DIR)/oplib/core_ops_cgp.h src/ops/core_ops_cgp.c',
cg_flag => '-DHAVE_COMPUTED_GOTO'
);
print " (yes) " if $verbose;
Modified: branches/one_make/config/auto/gc.pm
==============================================================================
--- branches/one_make/config/auto/gc.pm Thu Dec 31 00:56:11 2009 (r43329)
+++ branches/one_make/config/auto/gc.pm Thu Dec 31 00:58:05 2009 (r43330)
@@ -45,9 +45,9 @@
$conf->data->set(
TEMP_gc_c => <<"EOF",
-\$(SRC_DIR)/gc/alloc_resources\$(O): \$(GENERAL_H_FILES) \$(SRC_DIR)/gc/alloc_resources.c
+src/gc/alloc_resources\$(O): \$(GENERAL_H_FILES) src/gc/alloc_resources.c
EOF
- TEMP_gc_o => "\$(SRC_DIR)/gc/alloc_resources\$(O)",
+ TEMP_gc_o => "src/gc/alloc_resources\$(O)",
gc_flag => '',
);
print(" ($gc) ") if $conf->options->get('verbose');
Modified: branches/one_make/config/auto/pmc.pm
==============================================================================
--- branches/one_make/config/auto/pmc.pm Thu Dec 31 00:56:11 2009 (r43329)
+++ branches/one_make/config/auto/pmc.pm Thu Dec 31 00:58:05 2009 (r43330)
@@ -98,7 +98,7 @@
src/pmc/$pmc.dump : vtable.dump $parent_dumps src/pmc/$pmc.pmc \$(PMC2C_FILES) $pccmethod_depend
\t\$(PMC2CD) src/pmc/$pmc.pmc
-\$(PMC_INC_DIR)/pmc/pmc_$pmc.h: src/pmc/$pmc.c
+include/pmc/pmc_$pmc.h: src/pmc/$pmc.c
src/pmc/$pmc\$(O): include/pmc/pmc_${pmc}.h src/pmc/$pmc.str \$(NONGEN_HEADERS) \\
$parent_headers $include_headers include/pmc/pmc_continuation.h \\
@@ -173,7 +173,6 @@
TEMP_pmc_classes_o => $TEMP_pmc_classes_o,
TEMP_pmc_classes_str => $TEMP_pmc_classes_str,
TEMP_pmc_classes_pmc => $TEMP_pmc_classes_pmc,
- pmc_inc => 'include',
);
return 1;
Modified: branches/one_make/config/gen/makefiles/editor.in
==============================================================================
--- branches/one_make/config/gen/makefiles/editor.in Thu Dec 31 00:56:11 2009 (r43329)
+++ branches/one_make/config/gen/makefiles/editor.in Thu Dec 31 00:58:05 2009 (r43330)
@@ -1,7 +1,6 @@
# Copyright (C) 2005-2009, Parrot Foundation.
# $Id$
-OPS_DIR := ../src/ops
#IF(win32):VIM_DIR := $(USERPROFILE)/vimfiles
#ELSE:VIM_DIR := $(HOME)/.vim
VIM_FT_DIR := $(VIM_DIR)/plugin
@@ -33,9 +32,9 @@
@echo " realclean: clean up local files including Makefile"
@echo ""
-pir.vim: pir_vim.in $(OPS_DIR)//*.ops ops2vim.pl
+pir.vim: pir_vim.in ../src/ops/*.ops ops2vim.pl
$(CP) pir_vim.in pir.vim
- $(PERL) ops2vim.pl $(OPS_DIR)/*.ops >> pir.vim
+ $(PERL) ops2vim.pl ../src/ops/*.ops >> pir.vim
vim-install: pir.vim
$(MKPATH) "$(VIM_DIR)"
Modified: branches/one_make/config/gen/makefiles/root.in
==============================================================================
--- branches/one_make/config/gen/makefiles/root.in Thu Dec 31 00:56:11 2009 (r43329)
+++ branches/one_make/config/gen/makefiles/root.in Thu Dec 31 00:58:05 2009 (r43330)
@@ -50,30 +50,12 @@
# directory for build tools
BUILD_TOOLS_DIR := tools/build
-# current directory
-CUR_DIR := .
-
-# directory for the (experimental) PIR code compiler
-PIRC_DIR := compilers/pirc
-
# directory for header files
INC_DIR := @inc@
-# directory for PMC generated header files
-PMC_INC_DIR := @pmc_inc@
-
-# directory for the IO subsystem
-IO_DIR := src/io
-
# directory with Parrot modules
LIBRARY_DIR := runtime/parrot/library
-# directory for *.ops file
-OPS_DIR := src/ops
-
-# source directory
-SRC_DIR := src
-
###############################################################################
#
# BUILD TOOL CONFIGURATIONS:
@@ -106,7 +88,6 @@
LINKFLAGS := @linkflags@ @link_debug@ @ld_debug@
LD := @ld@
LDFLAGS := @ldflags@ @ld_debug@
-RECONFIGURE := $(PERL) tools/dev/reconfigure.pl
INNO_SETUP := iscc
TEMPDIR := @tempdir@
#IF(darwin):export MACOSX_DEPLOYMENT_TARGET := @osx_version@
@@ -157,25 +138,25 @@
$(INC_DIR)/has_header.h \
$(INC_DIR)/feature.h \
$(INC_DIR)/core_pmcs.h \
- $(SRC_DIR)/exec_dep.c \
- $(SRC_DIR)/exec_dep.h \
+ src/exec_dep.c \
+ src/exec_dep.h \
lib/Parrot/Config/Generated.pm \
lib/Parrot/PMC.pm \
runtime/parrot/include/config.fpmc \
$(LIBRARY_DIR)/config.pir \
- $(SRC_DIR)/platform.c \
-#IF(platform_asm): $(SRC_DIR)/platform_asm.s \
+ src/platform.c \
+#IF(platform_asm): src/platform_asm.s \
#IF(has_opengl): config/gen/call_list/opengl.in \
-#IF(has_glut): $(SRC_DIR)/glut_callbacks.c \
- $(SRC_DIR)/core_pmcs.c \
-#IF(has_crypto): $(SRC_DIR)/dynpmc/md2.pmc \
-#IF(has_crypto): $(SRC_DIR)/dynpmc/md4.pmc \
-#IF(has_crypto): $(SRC_DIR)/dynpmc/md5.pmc \
-#IF(has_crypto): $(SRC_DIR)/dynpmc/ripemd160.pmc \
-#IF(has_crypto): $(SRC_DIR)/dynpmc/sha.pmc \
-#IF(has_crypto): $(SRC_DIR)/dynpmc/sha1.pmc \
-#IF(has_crypto): $(SRC_DIR)/dynpmc/sha256.pmc \
-#IF(has_crypto): $(SRC_DIR)/dynpmc/sha512.pmc \
+#IF(has_glut): src/glut_callbacks.c \
+ src/core_pmcs.c \
+#IF(has_crypto): src/dynpmc/md2.pmc \
+#IF(has_crypto): src/dynpmc/md4.pmc \
+#IF(has_crypto): src/dynpmc/md5.pmc \
+#IF(has_crypto): src/dynpmc/ripemd160.pmc \
+#IF(has_crypto): src/dynpmc/sha.pmc \
+#IF(has_crypto): src/dynpmc/sha1.pmc \
+#IF(has_crypto): src/dynpmc/sha256.pmc \
+#IF(has_crypto): src/dynpmc/sha512.pmc \
#IF(has_crypto): t/dynpmc/md2.t \
#IF(has_crypto): t/dynpmc/md4.t \
#IF(has_crypto): t/dynpmc/md5.t \
@@ -191,8 +172,8 @@
$(BUILD_TOOLS_DIR)/dynoplibs.pl \
parrot.pc \
compilers/imcc/imcc.y.flag \
- $(OPS_DIR)/core_ops.c \
- $(OPS_DIR)/core_ops_switch.c
+ src/ops/core_ops.c \
+ src/ops/core_ops_switch.c
# most of these are generated by config/gen/parrot_include.pm
@@ -208,7 +189,7 @@
ext/Parrot-Embed/Makefile.PL \
myconfig \
$(GEN_PASM_INCLUDES) \
- $(SRC_DIR)/call_list.txt \
+ src/call_list.txt \
MANIFEST.configure.generated \
.configure_trace.sto \
.parrot_current_rev
@@ -235,13 +216,13 @@
$(INC_DIR)/pbcversion.h
GEN_SOURCES := \
- $(SRC_DIR)/core_ops.c \
- $(SRC_DIR)/nci.c \
- $(SRC_DIR)/core_ops_switch.c \
- $(SRC_DIR)/parrot_config.c \
- $(SRC_DIR)/null_config.c \
- $(SRC_DIR)/install_config.c \
- $(SRC_DIR)/extend_vtable.c
+ src/core_ops.c \
+ src/nci.c \
+ src/core_ops_switch.c \
+ src/parrot_config.c \
+ src/null_config.c \
+ src/install_config.c \
+ src/extend_vtable.c
GEN_MODULES := \
lib/Parrot/OpLib/core.pm
@@ -334,10 +315,10 @@
# these are private to the PIRC subsystem
PIRC_O_FILES := \
- $(PIRC_DIR)/src/bcgen$(O) \
- $(PIRC_DIR)/src/pircapi$(O) \
- $(PIRC_DIR)/src/pirerr$(O) \
- $(PIRC_DIR)/src/pirop$(O)
+ 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 := \
@@ -398,7 +379,7 @@
$(INC_DIR)/core_pmcs.h \
$(INC_DIR)/compiler.h \
$(INC_DIR)/cclass.h \
- $(PMC_INC_DIR)/pmc/pmc_callcontext.h
+ include/pmc/pmc_callcontext.h
# generated list of header files
GENERAL_H_FILES := $(NONGEN_HEADERS) $(GEN_HEADERS) @TEMP_cg_h@
@@ -410,91 +391,91 @@
ENCODING_O_FILES := @TEMP_encoding_o@
IO_O_FILES := \
- $(IO_DIR)/core$(O) \
- $(IO_DIR)/api$(O) \
- $(IO_DIR)/utf8$(O) \
- $(IO_DIR)/buffer$(O) \
- $(IO_DIR)/unix$(O) \
- $(IO_DIR)/win32$(O) \
- $(IO_DIR)/portable$(O) \
- $(IO_DIR)/filehandle$(O) \
- $(IO_DIR)/socket_api$(O) \
- $(IO_DIR)/socket_unix$(O) \
- $(IO_DIR)/socket_win32$(O)
+ src/io/core$(O) \
+ src/io/api$(O) \
+ src/io/utf8$(O) \
+ src/io/buffer$(O) \
+ src/io/unix$(O) \
+ src/io/win32$(O) \
+ src/io/portable$(O) \
+ src/io/filehandle$(O) \
+ src/io/socket_api$(O) \
+ src/io/socket_unix$(O) \
+ src/io/socket_win32$(O)
INTERP_O_FILES := \
- $(SRC_DIR)/string/api$(O) \
+ src/string/api$(O) \
\
- $(OPS_DIR)/core_ops$(O) \
- $(OPS_DIR)/core_ops_switch$(O) \
+ src/ops/core_ops$(O) \
+ src/ops/core_ops_switch$(O) \
\
-#IF(i386_has_gcc_cmpxchg): $(SRC_DIR)/atomic/gcc_x86$(O) \
- $(SRC_DIR)/byteorder$(O) \
- $(SRC_DIR)/string/charset$(O) \
- $(SRC_DIR)/core_pmcs$(O) \
- $(SRC_DIR)/datatypes$(O) \
- $(SRC_DIR)/debug$(O) \
- $(SRC_DIR)/dynext$(O) \
- $(SRC_DIR)/embed$(O) \
- $(SRC_DIR)/string/encoding$(O) \
- $(SRC_DIR)/events$(O) \
- $(SRC_DIR)/exceptions$(O) \
- $(SRC_DIR)/exit$(O) \
- $(SRC_DIR)/extend$(O) \
- $(SRC_DIR)/extend_vtable$(O) \
- $(SRC_DIR)/gc/alloc_memory$(O) \
- $(SRC_DIR)/gc/api$(O) \
- $(SRC_DIR)/gc/gc_ms$(O) \
- $(SRC_DIR)/gc/gc_inf$(O) \
- $(SRC_DIR)/gc/mark_sweep$(O) \
- $(SRC_DIR)/gc/system$(O) \
- $(SRC_DIR)/global$(O) \
- $(SRC_DIR)/global_setup$(O) \
- $(SRC_DIR)/hash$(O) \
- $(SRC_DIR)/hll$(O) \
- $(SRC_DIR)/call/pcc$(O) \
- $(SRC_DIR)/call/args$(O) \
- $(SRC_DIR)/interp/inter_cb$(O) \
- $(SRC_DIR)/interp/inter_create$(O) \
- $(SRC_DIR)/interp/inter_misc$(O) \
- $(SRC_DIR)/call/ops$(O) \
- $(SRC_DIR)/call/context$(O) \
- $(SRC_DIR)/call/context_accessors$(O) \
- $(SRC_DIR)/key$(O) \
- $(SRC_DIR)/library$(O) \
- $(SRC_DIR)/list$(O) \
- $(SRC_DIR)/longopt$(O) \
- $(SRC_DIR)/misc$(O) \
- $(SRC_DIR)/multidispatch$(O) \
- $(SRC_DIR)/frame_builder$(O) \
- $(SRC_DIR)/nci$(O) \
- $(SRC_DIR)/oo$(O) \
- $(SRC_DIR)/packfile$(O) \
- $(SRC_DIR)/packout$(O) \
- $(SRC_DIR)/platform$(O) \
- $(SRC_DIR)/pmc_freeze$(O) \
- $(SRC_DIR)/pmc$(O) \
- $(SRC_DIR)/runcore/main$(O) \
- $(SRC_DIR)/runcore/cores$(O) \
- $(SRC_DIR)/runcore/profiling$(O) \
- $(SRC_DIR)/scheduler$(O) \
- $(SRC_DIR)/spf_render$(O) \
- $(SRC_DIR)/spf_vtable$(O) \
- $(SRC_DIR)/string/primitives$(O) \
- $(SRC_DIR)/sub$(O) \
- $(SRC_DIR)/thread$(O) \
- $(SRC_DIR)/runcore/trace$(O) \
- $(SRC_DIR)/tsq$(O) \
- $(SRC_DIR)/utils$(O) \
- $(SRC_DIR)/vtables$(O) \
- $(SRC_DIR)/warnings$(O) \
+#IF(i386_has_gcc_cmpxchg): src/atomic/gcc_x86$(O) \
+ src/byteorder$(O) \
+ src/string/charset$(O) \
+ src/core_pmcs$(O) \
+ src/datatypes$(O) \
+ src/debug$(O) \
+ src/dynext$(O) \
+ src/embed$(O) \
+ src/string/encoding$(O) \
+ src/events$(O) \
+ src/exceptions$(O) \
+ src/exit$(O) \
+ src/extend$(O) \
+ src/extend_vtable$(O) \
+ src/gc/alloc_memory$(O) \
+ src/gc/api$(O) \
+ src/gc/gc_ms$(O) \
+ src/gc/gc_inf$(O) \
+ src/gc/mark_sweep$(O) \
+ src/gc/system$(O) \
+ src/global$(O) \
+ src/global_setup$(O) \
+ src/hash$(O) \
+ src/hll$(O) \
+ src/call/pcc$(O) \
+ src/call/args$(O) \
+ src/interp/inter_cb$(O) \
+ src/interp/inter_create$(O) \
+ src/interp/inter_misc$(O) \
+ src/call/ops$(O) \
+ src/call/context$(O) \
+ src/call/context_accessors$(O) \
+ src/key$(O) \
+ src/library$(O) \
+ src/list$(O) \
+ src/longopt$(O) \
+ src/misc$(O) \
+ src/multidispatch$(O) \
+ src/frame_builder$(O) \
+ src/nci$(O) \
+ src/oo$(O) \
+ src/packfile$(O) \
+ src/packout$(O) \
+ src/platform$(O) \
+ src/pmc_freeze$(O) \
+ src/pmc$(O) \
+ src/runcore/main$(O) \
+ src/runcore/cores$(O) \
+ src/runcore/profiling$(O) \
+ src/scheduler$(O) \
+ src/spf_render$(O) \
+ src/spf_vtable$(O) \
+ src/string/primitives$(O) \
+ src/sub$(O) \
+ src/thread$(O) \
+ src/runcore/trace$(O) \
+ src/tsq$(O) \
+ src/utils$(O) \
+ src/vtables$(O) \
+ src/warnings$(O) \
\
src/packfile/pf_items$(O) \
\
@TEMP_cg_o@ \
@TEMP_atomic_o@ \
@TEMP_gc_o@ \
-#IF(platform_asm): $(SRC_DIR)/platform_asm$(O) \
+#IF(platform_asm): src/platform_asm$(O) \
OPS_FILES := @ops@ $(GEN_OPSFILES)
@@ -505,26 +486,26 @@
###############################################################################
# Executables
-PARROT := $(CUR_DIR)/@test_prog@$(EXE)
-MINIPARROT := $(CUR_DIR)/miniparrot$(EXE)
-DIS := $(CUR_DIR)/pbc_disassemble$(EXE)
-PDUMP := $(CUR_DIR)/pbc_dump$(EXE)
-PBCMERGE := $(CUR_DIR)/pbc_merge$(EXE)
-PDB := $(CUR_DIR)/parrot_debugger$(EXE)
-PBC_TO_EXE := $(CUR_DIR)/pbc_to_exe$(EXE)
-PARROT_CONFIG := $(CUR_DIR)/parrot_config$(EXE)
-PIRC := $(CUR_DIR)/pirc$(EXE)
-NQP := $(CUR_DIR)/parrot-nqp$(EXE)
+PARROT := ./@test_prog@$(EXE)
+MINIPARROT := ./miniparrot$(EXE)
+DIS := ./pbc_disassemble$(EXE)
+PDUMP := ./pbc_dump$(EXE)
+PBCMERGE := ./pbc_merge$(EXE)
+PDB := ./parrot_debugger$(EXE)
+PBC_TO_EXE := ./pbc_to_exe$(EXE)
+PARROT_CONFIG := ./parrot_config$(EXE)
+PIRC := ./pirc$(EXE)
+NQP := ./parrot-nqp$(EXE)
# Installable executables
-INSTALLABLEPARROT := $(CUR_DIR)/installable_parrot$(EXE)
-INSTALLABLEDIS := $(CUR_DIR)/installable_pbc_disassemble$(EXE)
-INSTALLABLEPDUMP := $(CUR_DIR)/installable_pbc_dump$(EXE)
-INSTALLABLEPBCMERGE := $(CUR_DIR)/installable_pbc_merge$(EXE)
-INSTALLABLEPBCTOEXE := $(CUR_DIR)/installable_pbc_to_exe$(EXE)
-INSTALLABLEPDB := $(CUR_DIR)/installable_parrot_debugger$(EXE)
-INSTALLABLECONFIG := $(CUR_DIR)/installable_parrot_config$(EXE)
-INSTALLABLENQP := $(CUR_DIR)/installable_parrot-nqp$(EXE)
+INSTALLABLEPARROT := ./installable_parrot$(EXE)
+INSTALLABLEDIS := ./installable_pbc_disassemble$(EXE)
+INSTALLABLEPDUMP := ./installable_pbc_dump$(EXE)
+INSTALLABLEPBCMERGE := ./installable_pbc_merge$(EXE)
+INSTALLABLEPBCTOEXE := ./installable_pbc_to_exe$(EXE)
+INSTALLABLEPDB := ./installable_parrot_debugger$(EXE)
+INSTALLABLECONFIG := ./installable_parrot_config$(EXE)
+INSTALLABLENQP := ./installable_parrot-nqp$(EXE)
# Libraries
LIBPARROT_STATIC := @blib_dir@/@libparrot_static@
@@ -567,14 +548,14 @@
# arguments (etc) injected in the middle.
# There is probably a better way to do this, but I can't work it out right now.
.c$(O) : # suffix rule (limited support)
- @$(PERL) tools/dev/cc_flags.pl $(CUR_DIR)/CFLAGS $(CC) "" $(CFLAGS) -I$(@D) @cc_o_out@$@ -c $<
+ @$(PERL) tools/dev/cc_flags.pl ./CFLAGS $(CC) "" $(CFLAGS) -I$(@D) @cc_o_out@$@ -c $<
# XXX probably should detect assembler, but right now this is only used on Sparc
.s$(O) : # suffix rule (limited support)
- @$(PERL) tools/dev/cc_flags.pl $(CUR_DIR)/CFLAGS $(CC) "" $(CFLAGS) -I$(@D) @cc_o_out@$@ -c $<
+ @$(PERL) tools/dev/cc_flags.pl ./CFLAGS $(CC) "" $(CFLAGS) -I$(@D) @cc_o_out@$@ -c $<
#UNLESS(win32).S$(O) : # suffix rule (limited support)
-#UNLESS(win32) @$(PERL) tools/dev/cc_flags.pl $(CUR_DIR)/CFLAGS $(CC) "" $(CFLAGS) -I$(@D) @cc_o_out@$@ -c $<
+#UNLESS(win32) @$(PERL) tools/dev/cc_flags.pl ./CFLAGS $(CC) "" $(CFLAGS) -I$(@D) @cc_o_out@$@ -c $<
.pir.pbc : # suffix rule (limited support)
$(PARROT) -o $@ $<
@@ -621,40 +602,40 @@
$(PERL) $(BUILD_TOOLS_DIR)/c2str.pl $< > $@
STR_FILES := \
- $(SRC_DIR)/debug.str \
- $(SRC_DIR)/dynext.str \
- $(SRC_DIR)/events.str \
- $(SRC_DIR)/exceptions.str \
- $(SRC_DIR)/global.str \
- $(SRC_DIR)/global_setup.str \
- $(SRC_DIR)/hll.str \
- $(SRC_DIR)/call/pcc.str \
- $(SRC_DIR)/call/args.str \
- $(SRC_DIR)/interp/inter_cb.str \
- $(SRC_DIR)/interp/inter_create.str \
- $(SRC_DIR)/interp/inter_misc.str \
- $(SRC_DIR)/io/api.str \
- $(SRC_DIR)/key.str \
- $(SRC_DIR)/library.str \
- $(SRC_DIR)/multidispatch.str \
- $(SRC_DIR)/frame_builder.str \
- $(SRC_DIR)/nci.str \
- $(SRC_DIR)/packfile.str \
- $(SRC_DIR)/pmc.str \
- $(SRC_DIR)/pmc_freeze.str \
- $(SRC_DIR)/oo.str \
- $(SRC_DIR)/runcore/cores.str \
- $(SRC_DIR)/runcore/main.str \
- $(SRC_DIR)/runcore/profiling.str \
- $(SRC_DIR)/scheduler.str \
- $(SRC_DIR)/spf_render.str \
- $(SRC_DIR)/spf_vtable.str \
- $(SRC_DIR)/string/api.str \
- $(SRC_DIR)/sub.str \
+ src/debug.str \
+ src/dynext.str \
+ src/events.str \
+ src/exceptions.str \
+ src/global.str \
+ src/global_setup.str \
+ src/hll.str \
+ src/call/pcc.str \
+ src/call/args.str \
+ src/interp/inter_cb.str \
+ src/interp/inter_create.str \
+ src/interp/inter_misc.str \
+ src/io/api.str \
+ src/key.str \
+ src/library.str \
+ src/multidispatch.str \
+ src/frame_builder.str \
+ src/nci.str \
+ src/packfile.str \
+ src/pmc.str \
+ src/pmc_freeze.str \
+ src/oo.str \
+ src/runcore/cores.str \
+ src/runcore/main.str \
+ src/runcore/profiling.str \
+ src/scheduler.str \
+ src/spf_render.str \
+ src/spf_vtable.str \
+ src/string/api.str \
+ src/sub.str \
\
$(CLASS_STR_FILES)
-$(SRC_DIR)/string/private_cstring.h : $(STR_FILES) $(BUILD_TOOLS_DIR)/c2str.pl
+src/string/private_cstring.h : $(STR_FILES) $(BUILD_TOOLS_DIR)/c2str.pl
$(PERL) $(BUILD_TOOLS_DIR)/c2str.pl --all
# classes PMC build utils and rules
@@ -758,7 +739,7 @@
@echo "Fetch from source repository:"
@echo " update: svn update."
@echo " status: svn status."
- @echo " patch: Create a patch for sending to bugs-parrot."
+ @echo " patch: Create a patch to attach to https:////trac.parrot.org/"
@echo ""
@echo "Development:"
@echo " lint: An alias for sunlint."
@@ -791,7 +772,7 @@
flags_dummy :
@echo "Compiling with:"
- @$(PERL) tools/dev/cc_flags.pl $(CUR_DIR)/CFLAGS echo $(CC) $(CFLAGS) -I$(@D) @cc_o_out@ xx$(O) -c xx.c
+ @$(PERL) tools/dev/cc_flags.pl ./CFLAGS echo $(CC) $(CFLAGS) -I$(@D) @cc_o_out@ xx$(O) -c xx.c
runtime/parrot/include/parrotlib.pbc: runtime/parrot/library/parrotlib.pir $(PARROT)
$(PARROT) -o $@ runtime/parrot/library/parrotlib.pir
@@ -799,11 +780,11 @@
runtime/parrot/include/config.fpmc : myconfig config_lib.pasm $(MINIPARROT)
$(MINIPARROT) config_lib.pasm > $@
-$(PARROT) : $(SRC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) CFLAGS \
- lib/Parrot/OpLib/core.pm $(SRC_DIR)/parrot_config$(O) \
+$(PARROT) : src/main$(O) $(GEN_HEADERS) $(LIBPARROT) CFLAGS \
+ lib/Parrot/OpLib/core.pm src/parrot_config$(O) \
$(MINIPARROT)
$(LINK) @ld_out@$@ \
- $(SRC_DIR)/main$(O) $(SRC_DIR)/parrot_config$(O) \
+ src/main$(O) src/parrot_config$(O) \
@rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS) $(LINK_DYNAMIC)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
@@ -822,65 +803,65 @@
$(CP) compilers/pirc/pirc$(EXE) $(PIRC)
$(CHMOD) 0755 $(PIRC)
-$(MINIPARROT) : $(SRC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
- lib/Parrot/OpLib/core.pm $(SRC_DIR)/null_config$(O)
- $(LINK) @ld_out@$@ $(SRC_DIR)/main$(O) $(SRC_DIR)/null_config$(O) \
+$(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) \
@rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
-$(INSTALLABLEPARROT) : $(SRC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
- lib/Parrot/OpLib/core.pm $(SRC_DIR)/install_config$(O) \
+$(INSTALLABLEPARROT) : src/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
+ lib/Parrot/OpLib/core.pm src/install_config$(O) \
$(PARROT)
$(LINK) @ld_out@$@ \
- $(SRC_DIR)/main$(O) $(SRC_DIR)/install_config$(O) \
+ src/main$(O) src/install_config$(O) \
@rpath_lib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
-$(INC_DIR)/context.h : $(PMC_INC_DIR)/pmc/pmc_callcontext.h
+$(INC_DIR)/context.h : include/pmc/pmc_callcontext.h
$(INC_DIR)/pbcversion.h :
$(PERL) $(BUILD_TOOLS_DIR)/pbcversion_h.pl > $(INC_DIR)/pbcversion.h
-$(SRC_DIR)/parrot_config.c : runtime/parrot/include/config.fpmc \
+src/parrot_config.c : runtime/parrot/include/config.fpmc \
$(BUILD_TOOLS_DIR)/parrot_config_c.pl
$(PERL) $(BUILD_TOOLS_DIR)/parrot_config_c.pl > \
- $(SRC_DIR)/parrot_config.c
+ src/parrot_config.c
-$(SRC_DIR)/install_config.c : install_config.fpmc \
+src/install_config.c : install_config.fpmc \
$(BUILD_TOOLS_DIR)/parrot_config_c.pl
$(PERL) $(BUILD_TOOLS_DIR)/parrot_config_c.pl --install > \
- $(SRC_DIR)/install_config.c
+ src/install_config.c
-$(SRC_DIR)/null_config.c : myconfig $(BUILD_TOOLS_DIR)/parrot_config_c.pl
+src/null_config.c : myconfig $(BUILD_TOOLS_DIR)/parrot_config_c.pl
$(PERL) $(BUILD_TOOLS_DIR)/parrot_config_c.pl --mini > \
- $(SRC_DIR)/null_config.c
+ src/null_config.c
install_config.fpmc : myconfig config_lib.pasm $(PARROT)
@echo "Invoking Parrot to generate install_config.fpmc"
$(PARROT) config_lib.pasm --install > $@
-$(SRC_DIR)/parrot_config$(O) : $(PARROT_H_HEADERS)
+src/parrot_config$(O) : $(PARROT_H_HEADERS)
-$(SRC_DIR)/install_config$(O) : $(PARROT_H_HEADERS)
+src/install_config$(O) : $(PARROT_H_HEADERS)
-$(SRC_DIR)/null_config$(O) : $(PARROT_H_HEADERS)
+src/null_config$(O) : $(PARROT_H_HEADERS)
-$(SRC_DIR)/oo$(O) : $(PARROT_H_HEADERS) $(PMC_INC_DIR)/pmc/pmc_class.h $(PMC_INC_DIR)/pmc/pmc_object.h $(SRC_DIR)/oo.str $(INC_DIR)/oo_private.h
+src/oo$(O) : $(PARROT_H_HEADERS) include/pmc/pmc_class.h include/pmc/pmc_object.h src/oo.str $(INC_DIR)/oo_private.h
-$(SRC_DIR)/scheduler$(O) : $(PARROT_H_HEADERS) $(SRC_DIR)/scheduler.str \
- $(PMC_INC_DIR)/pmc/pmc_scheduler.h $(PMC_INC_DIR)/pmc/pmc_task.h \
- $(PMC_INC_DIR)/pmc/pmc_timer.h \
+src/scheduler$(O) : $(PARROT_H_HEADERS) src/scheduler.str \
+ include/pmc/pmc_scheduler.h include/pmc/pmc_task.h \
+ include/pmc/pmc_timer.h \
$(INC_DIR)/scheduler_private.h
-$(IO_DIR)/core$(O) : $(PARROT_H_HEADERS) $(IO_DIR)/io_private.h
+src/io/core$(O) : $(PARROT_H_HEADERS) src/io/io_private.h
-$(IO_DIR)/socket_api$(O) : $(PARROT_H_HEADERS) $(IO_DIR)/io_private.h $(IO_DIR)/api.str $(PMC_INC_DIR)/pmc/pmc_socket.h
+src/io/socket_api$(O) : $(PARROT_H_HEADERS) src/io/io_private.h src/io/api.str include/pmc/pmc_socket.h
-$(IO_DIR)/socket_unix$(O) : $(PARROT_H_HEADERS) $(PMC_INC_DIR)/pmc/pmc_socket.h $(IO_DIR)/io_private.h
+src/io/socket_unix$(O) : $(PARROT_H_HEADERS) include/pmc/pmc_socket.h src/io/io_private.h
-$(IO_DIR)/socket_win32$(O) : $(PARROT_H_HEADERS) \
- $(IO_DIR)/io_private.h \
- $(PMC_INC_DIR)/pmc/pmc_socket.h
+src/io/socket_win32$(O) : $(PARROT_H_HEADERS) \
+ src/io/io_private.h \
+ include/pmc/pmc_socket.h
include compilers/imcc/Makefile.mak
@@ -925,18 +906,18 @@
#IF(libparrot_shared_alias): ( cd @blib_dir@ ; ln -sf @libparrot_shared@ @libparrot_shared_alias@ )
-$(INSTALLABLECONFIG) : $(SRC_DIR)/install_config$(O) $(PARROT_CONFIG) $(PBC_TO_EXE)
+$(INSTALLABLECONFIG) : src/install_config$(O) $(PARROT_CONFIG) $(PBC_TO_EXE)
$(PARROT) -o parrot_config.pbc tools/util/parrot-config.pir
$(PBC_TO_EXE) parrot_config.pbc --install
-$(INSTALLABLEPBCTOEXE) : $(PBC_TO_EXE) $(SRC_DIR)/install_config$(O)
+$(INSTALLABLEPBCTOEXE) : $(PBC_TO_EXE) src/install_config$(O)
$(PBC_TO_EXE) pbc_to_exe.pbc --install
#
# Parrot Debugger
#
-$(SRC_DIR)/parrot_debugger$(O) : $(INC_DIR)/embed.h \
+src/parrot_debugger$(O) : $(INC_DIR)/embed.h \
$(INC_DIR)/runcore_api.h \
compilers/imcc/imc.h $(PARROT_H_HEADERS) compilers/imcc/parser.h \
compilers/imcc/cfg.h \
@@ -948,17 +929,17 @@
compilers/imcc/unit.h \
$(INC_DIR)/oplib/ops.h
-$(PDB) : $(SRC_DIR)/parrot_debugger$(O) $(SRC_DIR)/parrot_config$(O) $(LIBPARROT)
+$(PDB) : src/parrot_debugger$(O) src/parrot_config$(O) $(LIBPARROT)
$(LINK) @ld_out@$@ \
- $(SRC_DIR)/parrot_debugger$(O) \
- $(SRC_DIR)/parrot_config$(O) \
+ src/parrot_debugger$(O) \
+ src/parrot_config$(O) \
@rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
-$(INSTALLABLEPDB) : $(SRC_DIR)/parrot_debugger$(O) $(LIBPARROT) $(SRC_DIR)/parrot_config$(O)
+$(INSTALLABLEPDB) : src/parrot_debugger$(O) $(LIBPARROT) src/parrot_config$(O)
$(LINK) @ld_out@$@ \
- $(SRC_DIR)/parrot_debugger$(O) \
- $(SRC_DIR)/parrot_config$(O) \
+ src/parrot_debugger$(O) \
+ src/parrot_config$(O) \
@rpath_lib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
@@ -966,40 +947,40 @@
# Parrot Disassembler
#
-$(SRC_DIR)/pbc_disassemble$(O) : $(INC_DIR)/embed.h $(PARROT_H_HEADERS)
+src/pbc_disassemble$(O) : $(INC_DIR)/embed.h $(PARROT_H_HEADERS)
-$(DIS) : $(SRC_DIR)/pbc_disassemble$(O) $(LIBPARROT)
+$(DIS) : src/pbc_disassemble$(O) $(LIBPARROT)
$(LINK) @ld_out@$@ \
- $(SRC_DIR)/pbc_disassemble$(O) \
+ src/pbc_disassemble$(O) \
@rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
-$(INSTALLABLEDIS) : $(SRC_DIR)/pbc_disassemble$(O) \
- $(SRC_DIR)/install_config$(O) $(LIBPARROT)
+$(INSTALLABLEDIS) : src/pbc_disassemble$(O) \
+ src/install_config$(O) $(LIBPARROT)
$(LINK) @ld_out@$@ \
- $(SRC_DIR)/pbc_disassemble$(O) \
+ src/pbc_disassemble$(O) \
@rpath_lib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
#
# Parrot Dump
#
-$(SRC_DIR)/packdump$(O) : $(PARROT_H_HEADERS) $(PMC_INC_DIR)/pmc/pmc_sub.h $(PMC_INC_DIR)/pmc/pmc_key.h
+src/packdump$(O) : $(PARROT_H_HEADERS) include/pmc/pmc_sub.h include/pmc/pmc_key.h
-$(PDUMP) : $(SRC_DIR)/pbc_dump$(O) $(SRC_DIR)/packdump$(O) $(LIBPARROT)
+$(PDUMP) : src/pbc_dump$(O) src/packdump$(O) $(LIBPARROT)
$(LINK) @ld_out@$@ \
- $(SRC_DIR)/pbc_dump$(O) \
- $(SRC_DIR)/packdump$(O) @rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
+ src/pbc_dump$(O) \
+ src/packdump$(O) @rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
-$(SRC_DIR)/pbc_dump$(O) : $(INC_DIR)/embed.h $(INC_DIR)/oplib/ops.h \
+src/pbc_dump$(O) : $(INC_DIR)/embed.h $(INC_DIR)/oplib/ops.h \
$(PARROT_H_HEADERS)
-$(INSTALLABLEPDUMP) : $(SRC_DIR)/pbc_dump$(O) $(SRC_DIR)/packdump$(O) \
- $(SRC_DIR)/install_config$(O) $(LIBPARROT)
+$(INSTALLABLEPDUMP) : src/pbc_dump$(O) src/packdump$(O) \
+ src/install_config$(O) $(LIBPARROT)
$(LINK) @ld_out@$@ \
- $(SRC_DIR)/pbc_dump$(O) \
- $(SRC_DIR)/packdump$(O) \
+ src/pbc_dump$(O) \
+ src/packdump$(O) \
@rpath_lib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
@@ -1009,17 +990,17 @@
# Parrot Bytecode File Merger
#
-$(PBCMERGE) : $(SRC_DIR)/pbc_merge$(O) $(LIBPARROT) $(SRC_DIR)/parrot_config$(O)
+$(PBCMERGE) : src/pbc_merge$(O) $(LIBPARROT) src/parrot_config$(O)
$(LINK) @ld_out@$@ \
- $(SRC_DIR)/pbc_merge$(O) \
- $(SRC_DIR)/parrot_config$(O) \
+ src/pbc_merge$(O) \
+ src/parrot_config$(O) \
@rpath_blib@ $(ALL_PARROT_LIBS) $(LINK_DYNAMIC) $(LINKFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
-$(INSTALLABLEPBCMERGE) : $(SRC_DIR)/pbc_merge$(O) $(LIBPARROT) $(INSTALLABLECONFIG)
+$(INSTALLABLEPBCMERGE) : src/pbc_merge$(O) $(LIBPARROT) $(INSTALLABLECONFIG)
$(LINK) @ld_out@$@ \
- $(SRC_DIR)/pbc_merge$(O) \
- $(SRC_DIR)/install_config$(O) \
+ src/pbc_merge$(O) \
+ src/install_config$(O) \
@rpath_lib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
@@ -1031,7 +1012,7 @@
###############################################################################
$(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
+ lib/Parrot/OpsFile.pm lib/Parrot/Op.pm src/ops/ops.num src/ops/ops.skip
$(PERL) $(BUILD_TOOLS_DIR)/ops2pm.pl @no_lines_flag@ $(OPS_FILES)
###############################################################################
@@ -1050,7 +1031,7 @@
# hello
hello: test_prep examples/pasm/hello$(EXE)
- $(CUR_DIR)/examples/pasm/hello$(EXE) "from your friendly makefile"
+ ./examples/pasm/hello$(EXE) "from your friendly makefile"
examples/pasm/hello.pbc: examples/pasm/hello.pasm
$(PARROT) -o examples/pasm/hello.pbc examples/pasm/hello.pasm
@@ -1069,131 +1050,131 @@
#
###############################################################################
-$(SRC_DIR)/byteorder$(O) : $(PARROT_H_HEADERS)
+src/byteorder$(O) : $(PARROT_H_HEADERS)
-$(SRC_DIR)/datatypes$(O) : $(PARROT_H_HEADERS)
+src/datatypes$(O) : $(PARROT_H_HEADERS)
-$(SRC_DIR)/extend_vtable$(O) : $(PARROT_H_HEADERS) \
+src/extend_vtable$(O) : $(PARROT_H_HEADERS) \
$(INC_DIR)/extend.h $(INC_DIR)/extend_vtable.h
-$(SRC_DIR)/global_setup$(O) : $(PARROT_H_HEADERS) $(SRC_DIR)/global_setup.str
+src/global_setup$(O) : $(PARROT_H_HEADERS) src/global_setup.str
-$(SRC_DIR)/global$(O) : $(PARROT_H_HEADERS) $(SRC_DIR)/global.str \
- $(PMC_INC_DIR)/pmc/pmc_sub.h
+src/global$(O) : $(PARROT_H_HEADERS) src/global.str \
+ include/pmc/pmc_sub.h
-$(SRC_DIR)/pmc$(O) : $(PMC_INC_DIR)/pmc/pmc_class.h \
- $(SRC_DIR)/pmc.str $(PARROT_H_HEADERS)
+src/pmc$(O) : include/pmc/pmc_class.h \
+ src/pmc.str $(PARROT_H_HEADERS)
-$(SRC_DIR)/pmc_freeze$(O) : $(PARROT_H_HEADERS) $(SRC_DIR)/pmc_freeze.str
+src/pmc_freeze$(O) : $(PARROT_H_HEADERS) src/pmc_freeze.str
-$(SRC_DIR)/hash$(O) : $(PARROT_H_HEADERS) $(PMC_INC_DIR)/pmc/pmc_key.h
+src/hash$(O) : $(PARROT_H_HEADERS) include/pmc/pmc_key.h
-$(SRC_DIR)/list$(O) : $(PARROT_H_HEADERS)
+src/list$(O) : $(PARROT_H_HEADERS)
-$(SRC_DIR)/library$(O) : $(PARROT_H_HEADERS) $(SRC_DIR)/library.str \
+src/library$(O) : $(PARROT_H_HEADERS) src/library.str \
$(INC_DIR)/dynext.h
-$(INC_DIR)/extend_vtable.h $(SRC_DIR)/extend_vtable.c $(SRC_DIR)/vtable.h : src/vtable.tbl $(BUILD_TOOLS_DIR)/vtable_extend.pl lib/Parrot/Vtable.pm
+$(INC_DIR)/extend_vtable.h src/extend_vtable.c src/vtable.h : src/vtable.tbl $(BUILD_TOOLS_DIR)/vtable_extend.pl lib/Parrot/Vtable.pm
$(PERL) $(BUILD_TOOLS_DIR)/vtable_extend.pl
-$(SRC_DIR)/key$(O) : $(PARROT_H_HEADERS) $(SRC_DIR)/key.str \
- $(PMC_INC_DIR)/pmc/pmc_key.h
+src/key$(O) : $(PARROT_H_HEADERS) src/key.str \
+ include/pmc/pmc_key.h
-$(SRC_DIR)/gc/mark_sweep$(O) : $(PARROT_H_HEADERS) $(SRC_DIR)/gc/gc_private.h
+src/gc/mark_sweep$(O) : $(PARROT_H_HEADERS) src/gc/gc_private.h
-$(SRC_DIR)/gc/gc_ms$(O) : $(PARROT_H_HEADERS) $(SRC_DIR)/gc/gc_private.h
+src/gc/gc_ms$(O) : $(PARROT_H_HEADERS) src/gc/gc_private.h
-$(SRC_DIR)/gc/gc_inf$(O) : $(PARROT_H_HEADERS) $(SRC_DIR)/gc/gc_private.h
+src/gc/gc_inf$(O) : $(PARROT_H_HEADERS) src/gc/gc_private.h
-$(SRC_DIR)/gc/api$(O) : $(PARROT_H_HEADERS) $(SRC_DIR)/gc/gc_private.h
+src/gc/api$(O) : $(PARROT_H_HEADERS) src/gc/gc_private.h
-$(SRC_DIR)/gc/alloc_resources$(O) : $(PARROT_H_HEADERS) \
- $(SRC_DIR)/gc/gc_private.h
+src/gc/alloc_resources$(O) : $(PARROT_H_HEADERS) \
+ src/gc/gc_private.h
-$(SRC_DIR)/hll$(O) : $(PARROT_H_HEADERS) $(SRC_DIR)/hll.str $(INC_DIR)/dynext.h
+src/hll$(O) : $(PARROT_H_HEADERS) src/hll.str $(INC_DIR)/dynext.h
-$(SRC_DIR)/platform$(O) : $(PARROT_H_HEADERS)
+src/platform$(O) : $(PARROT_H_HEADERS)
-#IF(platform_asm):$(SRC_DIR)/platform_asm$(O) : $(PARROT_H_HEADERS)
+#IF(platform_asm):src/platform_asm$(O) : $(PARROT_H_HEADERS)
#IF(platform_asm):
-$(SRC_DIR)/core_pmcs$(O) : $(PARROT_H_HEADERS)
+src/core_pmcs$(O) : $(PARROT_H_HEADERS)
-$(SRC_DIR)/runcore/trace$(O) : $(PMC_INC_DIR)/pmc/pmc_sub.h \
+src/runcore/trace$(O) : include/pmc/pmc_sub.h \
$(INC_DIR)/oplib/ops.h $(INC_DIR)/runcore_trace.h \
$(PARROT_H_HEADERS)
-$(SRC_DIR)/debug$(O) : $(INC_DIR)/embed.h $(INC_DIR)/extend.h \
+src/debug$(O) : $(INC_DIR)/embed.h $(INC_DIR)/extend.h \
$(PARROT_H_HEADERS) \
$(INC_DIR)/oplib/ops.h \
$(INC_DIR)/runcore_api.h $(INC_DIR)/runcore_trace.h \
- $(SRC_DIR)/debug.str $(PMC_INC_DIR)/pmc/pmc_key.h \
- $(PMC_INC_DIR)/pmc/pmc_continuation.h \
+ src/debug.str include/pmc/pmc_key.h \
+ include/pmc/pmc_continuation.h \
$(INC_DIR)/extend_vtable.h
-$(SRC_DIR)/sub$(O) : $(PARROT_H_HEADERS) $(INC_DIR)/oplib/ops.h \
- $(SRC_DIR)/sub.str \
- $(PMC_INC_DIR)/pmc/pmc_sub.h $(PMC_INC_DIR)/pmc/pmc_continuation.h
+src/sub$(O) : $(PARROT_H_HEADERS) $(INC_DIR)/oplib/ops.h \
+ src/sub.str \
+ include/pmc/pmc_sub.h include/pmc/pmc_continuation.h
-$(SRC_DIR)/string/api$(O) : $(PARROT_H_HEADERS) $(SRC_DIR)/string/api.str \
- $(SRC_DIR)/string/private_cstring.h
+src/string/api$(O) : $(PARROT_H_HEADERS) src/string/api.str \
+ src/string/private_cstring.h
-$(SRC_DIR)/string/primitives$(O) : $(PARROT_H_HEADERS)
+src/string/primitives$(O) : $(PARROT_H_HEADERS)
-$(SRC_DIR)/longopt$(O) : $(PARROT_H_HEADERS)
+src/longopt$(O) : $(PARROT_H_HEADERS)
-$(SRC_DIR)/dynext$(O) : $(PARROT_H_HEADERS) $(INC_DIR)/dynext.h \
- $(SRC_DIR)/dynext.str $(PMC_INC_DIR)/pmc/pmc_parrotlibrary.h
+src/dynext$(O) : $(PARROT_H_HEADERS) $(INC_DIR)/dynext.h \
+ src/dynext.str include/pmc/pmc_parrotlibrary.h
-$(SRC_DIR)/exceptions$(O) : $(PARROT_H_HEADERS) \
- $(SRC_DIR)/exceptions.str \
- $(PMC_INC_DIR)/pmc/pmc_continuation.h
+src/exceptions$(O) : $(PARROT_H_HEADERS) \
+ src/exceptions.str \
+ include/pmc/pmc_continuation.h
-$(SRC_DIR)/events$(O) : $(PARROT_H_HEADERS) $(SRC_DIR)/events.str
+src/events$(O) : $(PARROT_H_HEADERS) src/events.str
-$(SRC_DIR)/thread$(O) : $(PARROT_H_HEADERS) $(INC_DIR)/atomic.h \
- $(PMC_INC_DIR)/pmc/pmc_sub.h \
- $(PMC_INC_DIR)/pmc/pmc_parrotinterpreter.h
+src/thread$(O) : $(PARROT_H_HEADERS) $(INC_DIR)/atomic.h \
+ include/pmc/pmc_sub.h \
+ include/pmc/pmc_parrotinterpreter.h
-$(SRC_DIR)/extend$(O) : $(PARROT_H_HEADERS) $(INC_DIR)/extend.h \
- $(PMC_INC_DIR)/pmc/pmc_sub.h $(INC_DIR)/extend_vtable.h
+src/extend$(O) : $(PARROT_H_HEADERS) $(INC_DIR)/extend.h \
+ include/pmc/pmc_sub.h $(INC_DIR)/extend_vtable.h
-$(SRC_DIR)/runcore/main$(O) : \
- $(SRC_DIR)/runcore/main.str \
- $(PMC_INC_DIR)/pmc/pmc_parrotlibrary.h \
+src/runcore/main$(O) : \
+ src/runcore/main.str \
+ include/pmc/pmc_parrotlibrary.h \
$(INC_DIR)/dynext.h $(INC_DIR)/oplib/core_ops.h \
$(INC_DIR)/oplib/core_ops_switch.h $(INC_DIR)/oplib/ops.h \
$(PARROT_H_HEADERS) $(INC_DIR)/runcore_api.h \
$(INC_DIR)/runcore_profiling.h
-$(SRC_DIR)/runcore/profiling$(O) : $(SRC_DIR)/runcore/profiling.str \
- $(PMC_INC_DIR)/pmc/pmc_sub.h \
- $(PMC_INC_DIR)/pmc/pmc_namespace.h \
+src/runcore/profiling$(O) : src/runcore/profiling.str \
+ include/pmc/pmc_sub.h \
+ include/pmc/pmc_namespace.h \
$(INC_DIR)/oplib/core_ops.h $(INC_DIR)/runcore_api.h \
$(INC_DIR)/runcore_profiling.h $(INC_DIR)/embed.h \
$(PARROT_H_HEADERS)
-$(SRC_DIR)/call/args$(O) : \
+src/call/args$(O) : \
$(PARROT_H_HEADERS) $(INC_DIR)/oplib/ops.h \
- $(SRC_DIR)/call/args.str \
- $(PMC_INC_DIR)/pmc/pmc_key.h \
- $(PMC_INC_DIR)/pmc/pmc_fixedintegerarray.h
+ src/call/args.str \
+ include/pmc/pmc_key.h \
+ include/pmc/pmc_fixedintegerarray.h
-$(SRC_DIR)/call/context_accessors$(O): $(PARROT_H_HEADERS)
+src/call/context_accessors$(O): $(PARROT_H_HEADERS)
-$(SRC_DIR)/call/pcc$(O) : $(INC_DIR)/oplib/ops.h \
+src/call/pcc$(O) : $(INC_DIR)/oplib/ops.h \
$(PARROT_H_HEADERS) \
$(INC_DIR)/runcore_api.h \
- $(SRC_DIR)/call/pcc.str \
- $(PMC_INC_DIR)/pmc/pmc_key.h $(PMC_INC_DIR)/pmc/pmc_continuation.h
+ src/call/pcc.str \
+ include/pmc/pmc_key.h include/pmc/pmc_continuation.h
-$(SRC_DIR)/call/context$(O) : $(PARROT_H_HEADERS) \
- $(PMC_INC_DIR)/pmc/pmc_sub.h
+src/call/context$(O) : $(PARROT_H_HEADERS) \
+ include/pmc/pmc_sub.h
-$(SRC_DIR)/interp/inter_cb$(O) : $(PARROT_H_HEADERS) \
- $(SRC_DIR)/interp/inter_cb.str
+src/interp/inter_cb$(O) : $(PARROT_H_HEADERS) \
+ src/interp/inter_cb.str
-$(SRC_DIR)/interp/inter_misc$(O) : $(PARROT_H_HEADERS) \
- $(SRC_DIR)/interp/inter_misc.str \
+src/interp/inter_misc$(O) : $(PARROT_H_HEADERS) \
+ src/interp/inter_misc.str \
compilers/imcc/imc.h \
compilers/imcc/cfg.h \
compilers/imcc/debug.h \
@@ -1204,9 +1185,9 @@
$(INC_DIR)/oplib/ops.h \
$(INC_DIR)/runcore_api.h
-$(SRC_DIR)/interp/inter_create$(O) : $(PARROT_H_HEADERS) \
+src/interp/inter_create$(O) : $(PARROT_H_HEADERS) \
$(INC_DIR)/oplib/core_ops.h \
- $(SRC_DIR)/interp/inter_create.str \
+ src/interp/inter_create.str \
compilers/imcc/imc.h \
compilers/imcc/cfg.h \
compilers/imcc/debug.h \
@@ -1217,35 +1198,35 @@
$(INC_DIR)/oplib/ops.h \
$(INC_DIR)/runcore_api.h
-$(SRC_DIR)/call/ops$(O) : $(INC_DIR)/oplib/ops.h \
- $(PARROT_H_HEADERS) $(PMC_INC_DIR)/pmc/pmc_continuation.h
+src/call/ops$(O) : $(INC_DIR)/oplib/ops.h \
+ $(PARROT_H_HEADERS) include/pmc/pmc_continuation.h
-$(IO_DIR)/api$(O) : $(PARROT_H_HEADERS) $(IO_DIR)/io_private.h \
- $(IO_DIR)/api.str $(PMC_INC_DIR)/pmc/pmc_filehandle.h \
- $(PMC_INC_DIR)/pmc/pmc_stringhandle.h
+src/io/api$(O) : $(PARROT_H_HEADERS) src/io/io_private.h \
+ src/io/api.str include/pmc/pmc_filehandle.h \
+ include/pmc/pmc_stringhandle.h
-$(IO_DIR)/buffer$(O) : $(PARROT_H_HEADERS) $(IO_DIR)/io_private.h
+src/io/buffer$(O) : $(PARROT_H_HEADERS) src/io/io_private.h
-$(IO_DIR)/portable$(O) : $(PARROT_H_HEADERS) $(IO_DIR)/io_private.h
+src/io/portable$(O) : $(PARROT_H_HEADERS) src/io/io_private.h
-$(IO_DIR)/unix$(O) : $(PARROT_H_HEADERS) $(IO_DIR)/io_private.h $(PMC_INC_DIR)/pmc/pmc_filehandle.h
+src/io/unix$(O) : $(PARROT_H_HEADERS) src/io/io_private.h include/pmc/pmc_filehandle.h
-$(IO_DIR)/utf8$(O) : $(PARROT_H_HEADERS) $(IO_DIR)/io_private.h $(SRC_DIR)/string/unicode.h
+src/io/utf8$(O) : $(PARROT_H_HEADERS) src/io/io_private.h src/string/unicode.h
-$(IO_DIR)/win32$(O) : $(PARROT_H_HEADERS) $(IO_DIR)/io_private.h $(PMC_INC_DIR)/pmc/pmc_filehandle.h
+src/io/win32$(O) : $(PARROT_H_HEADERS) src/io/io_private.h include/pmc/pmc_filehandle.h
-$(SRC_DIR)/gc/alloc_memory$(O) : $(PARROT_H_HEADERS)
+src/gc/alloc_memory$(O) : $(PARROT_H_HEADERS)
-$(SRC_DIR)/main$(O) : $(INC_DIR)/imcc.h $(PARROT_H_HEADERS) \
+src/main$(O) : $(INC_DIR)/imcc.h $(PARROT_H_HEADERS) \
$(INC_DIR)/embed.h
-$(SRC_DIR)/multidispatch$(O) : \
- $(SRC_DIR)/multidispatch.str \
+src/multidispatch$(O) : \
+ src/multidispatch.str \
$(INC_DIR)/oplib/ops.h $(PARROT_H_HEADERS) \
- $(PMC_INC_DIR)/pmc/pmc_nci.h $(PMC_INC_DIR)/pmc/pmc_sub.h
+ include/pmc/pmc_nci.h include/pmc/pmc_sub.h
-$(SRC_DIR)/packfile$(O) : $(SRC_DIR)/packfile.str \
- $(PMC_INC_DIR)/pmc/pmc_sub.h $(PMC_INC_DIR)/pmc/pmc_key.h \
+src/packfile$(O) : src/packfile.str \
+ include/pmc/pmc_sub.h include/pmc/pmc_key.h \
compilers/imcc/imc.h \
compilers/imcc/cfg.h \
compilers/imcc/debug.h \
@@ -1259,20 +1240,20 @@
src/packfile/pf_items$(O) : $(PARROT_H_HEADERS)
-$(SRC_DIR)/packout$(O) : $(PARROT_H_HEADERS) $(PMC_INC_DIR)/pmc/pmc_key.h
+src/packout$(O) : $(PARROT_H_HEADERS) include/pmc/pmc_key.h
-$(SRC_DIR)/parrot$(O) : $(GENERAL_H_FILES)
+src/parrot$(O) : $(GENERAL_H_FILES)
-$(SRC_DIR)/runcore/cores$(O) : $(SRC_DIR)/runcore/cores.str \
- $(PMC_INC_DIR)/pmc/pmc_sub.h \
+src/runcore/cores$(O) : src/runcore/cores.str \
+ include/pmc/pmc_sub.h \
$(INC_DIR)/dynext.h $(INC_DIR)/embed.h $(INC_DIR)/oplib/core_ops.h \
$(INC_DIR)/oplib/core_ops_switch.h $(INC_DIR)/oplib/ops.h \
$(INC_DIR)/runcore_api.h $(INC_DIR)/runcore_trace.h \
$(PARROT_H_HEADERS)
-$(SRC_DIR)/tsq$(O) : $(PARROT_H_HEADERS)
+src/tsq$(O) : $(PARROT_H_HEADERS)
-$(SRC_DIR)/embed$(O) : $(PARROT_H_HEADERS) $(INC_DIR)/embed.h \
+src/embed$(O) : $(PARROT_H_HEADERS) $(INC_DIR)/embed.h \
$(INC_DIR)/oplib/ops.h $(INC_DIR)/runcore_api.h \
compilers/imcc/imc.h \
compilers/imcc/cfg.h \
@@ -1281,60 +1262,60 @@
compilers/imcc/sets.h \
compilers/imcc/symreg.h \
compilers/imcc/unit.h \
- $(PMC_INC_DIR)/pmc/pmc_sub.h
+ include/pmc/pmc_sub.h
-$(SRC_DIR)/dataypes$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/dataypes.c
+src/dataypes$(O) : $(GENERAL_H_FILES) src/dataypes.c
-$(SRC_DIR)/exit$(O) : $(PARROT_H_HEADERS)
+src/exit$(O) : $(PARROT_H_HEADERS)
-$(SRC_DIR)/nci$(O) : $(SRC_DIR)/nci.str \
+src/nci$(O) : src/nci.str \
$(INC_DIR)/oplib/ops.h $(PARROT_H_HEADERS) \
- $(SRC_DIR)/frame_builder.h \
- $(PMC_INC_DIR)/pmc/pmc_managedstruct.h \
- $(PMC_INC_DIR)/pmc/pmc_nci.h \
- $(PMC_INC_DIR)/pmc/pmc_pointer.h
-
-$(SRC_DIR)/frame_builder$(O) : $(PARROT_H_HEADERS) $(SRC_DIR)/frame_builder.h \
- $(PMC_INC_DIR)/pmc/pmc_fixedintegerarray.h \
- $(PMC_INC_DIR)/pmc/pmc_unmanagedstruct.h \
- $(PMC_INC_DIR)/pmc/pmc_managedstruct.h \
+ src/frame_builder.h \
+ include/pmc/pmc_managedstruct.h \
+ include/pmc/pmc_nci.h \
+ include/pmc/pmc_pointer.h
+
+src/frame_builder$(O) : $(PARROT_H_HEADERS) src/frame_builder.h \
+ include/pmc/pmc_fixedintegerarray.h \
+ include/pmc/pmc_unmanagedstruct.h \
+ include/pmc/pmc_managedstruct.h \
$(INC_DIR)/oplib/ops.h
-$(SRC_DIR)/vtables$(O) : $(PARROT_H_HEADERS)
+src/vtables$(O) : $(PARROT_H_HEADERS)
-$(SRC_DIR)/gc/system$(O) : $(PARROT_H_HEADERS) $(SRC_DIR)/gc/gc_private.h
-$(SRC_DIR)/gc/gc_private.h : $(INC_DIR)/settings.h
+src/gc/system$(O) : $(PARROT_H_HEADERS) src/gc/gc_private.h
+src/gc/gc_private.h : $(INC_DIR)/settings.h
-$(SRC_DIR)/nci.c : $(SRC_DIR)/call_list.txt $(BUILD_TOOLS_DIR)/nativecall.pl \
- $(PMC_INC_DIR)/pmc/pmc_nci.h
- $(PERL) $(BUILD_TOOLS_DIR)/nativecall.pl $(SRC_DIR)/call_list.txt
+src/nci.c : src/call_list.txt $(BUILD_TOOLS_DIR)/nativecall.pl \
+ include/pmc/pmc_nci.h
+ $(PERL) $(BUILD_TOOLS_DIR)/nativecall.pl src/call_list.txt
-$(SRC_DIR)/warnings$(O) : $(PARROT_H_HEADERS)
+src/warnings$(O) : $(PARROT_H_HEADERS)
-$(SRC_DIR)/misc$(O) : $(PARROT_H_HEADERS)
+src/misc$(O) : $(PARROT_H_HEADERS)
-$(SRC_DIR)/utils$(O) : $(PARROT_H_HEADERS) $(PMC_INC_DIR)/pmc/pmc_nci.h
+src/utils$(O) : $(PARROT_H_HEADERS) include/pmc/pmc_nci.h
-$(SRC_DIR)/spf_render$(O) : $(PARROT_H_HEADERS) $(SRC_DIR)/spf_render.str
+src/spf_render$(O) : $(PARROT_H_HEADERS) src/spf_render.str
-$(SRC_DIR)/spf_vtable$(O) : $(PARROT_H_HEADERS) $(SRC_DIR)/spf_vtable.str
+src/spf_vtable$(O) : $(PARROT_H_HEADERS) src/spf_vtable.str
-$(SRC_DIR)/string/encoding$(O) : $(PARROT_H_HEADERS)
+src/string/encoding$(O) : $(PARROT_H_HEADERS)
-$(SRC_DIR)/string/charset$(O) : $(PARROT_H_HEADERS) \
- $(SRC_DIR)/string/encoding/fixed_8.h \
- $(SRC_DIR)/string/encoding/utf8.h \
- $(SRC_DIR)/string/encoding/utf16.h \
- $(SRC_DIR)/string/encoding/ucs2.h \
- $(SRC_DIR)/string/charset/ascii.h \
- $(SRC_DIR)/string/charset/binary.h \
- $(SRC_DIR)/string/charset/iso-8859-1.h \
- $(SRC_DIR)/string/charset/unicode.h
+src/string/charset$(O) : $(PARROT_H_HEADERS) \
+ src/string/encoding/fixed_8.h \
+ src/string/encoding/utf8.h \
+ src/string/encoding/utf16.h \
+ src/string/encoding/ucs2.h \
+ src/string/charset/ascii.h \
+ src/string/charset/binary.h \
+ src/string/charset/iso-8859-1.h \
+ src/string/charset/unicode.h
-$(SRC_DIR)/pbc_merge$(O) : $(INC_DIR)/embed.h \
- $(PMC_INC_DIR)/pmc/pmc_sub.h $(INC_DIR)/oplib/ops.h $(PARROT_H_HEADERS)
+src/pbc_merge$(O) : $(INC_DIR)/embed.h \
+ include/pmc/pmc_sub.h $(INC_DIR)/oplib/ops.h $(PARROT_H_HEADERS)
-$(IO_DIR)/filehandle$(O) : $(PARROT_H_HEADERS) $(PMC_INC_DIR)/pmc/pmc_filehandle.h $(SRC_DIR)/io/io_private.h
+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 \
@@ -1351,10 +1332,10 @@
$(INC_DIR)/oplib/ops.h
src/dynpmc/subproxy$(O) : $(PARROT_H_HEADERS) $(INC_DIR)/extend.h \
- $(INC_DIR)/dynext.h $(PMC_INC_DIR)/pmc/pmc_subproxy.h \
- $(PMC_INC_DIR)/pmc/pmc_sub.h $(PMC_INC_DIR)/pmc_default.h \
- $(PMC_INC_DIR)/pmc/pmc_continuation.h $(PMC_INC_DIR)/pmc/pmc_callcontext.h \
- $(PMC_INC_DIR)/pmc/pmc_default.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 \
@@ -1397,8 +1378,8 @@
compilers/pirc/src/bcgen.h \
$(PARROT_H_HEADERS) \
$(INC_DIR)/embed.h \
- $(PMC_INC_DIR)/pmc/pmc_sub.h \
- $(PMC_INC_DIR)/pmc/pmc_namespace.h
+ include/pmc/pmc_sub.h \
+ include/pmc/pmc_namespace.h
compilers/pirc/src/pirregalloc$(O) : $(PARROT_H_HEADERS) \
compilers/pirc/src/pircompiler.h \
@@ -1556,10 +1537,10 @@
src/atomic/gcc_x86$(O) : $(PARROT_H_HEADERS) $(INC_DIR)/atomic/gcc_x86.h
-$(OPS_DIR)/core_ops$(O) : $(OPS_DIR)/core_ops.c \
- $(PMC_INC_DIR)/pmc/pmc_callcontext.h \
- $(PMC_INC_DIR)/pmc/pmc_continuation.h \
- $(PMC_INC_DIR)/pmc/pmc_parrotlibrary.h \
+src/ops/core_ops$(O) : src/ops/core_ops.c \
+ include/pmc/pmc_callcontext.h \
+ include/pmc/pmc_continuation.h \
+ include/pmc/pmc_parrotlibrary.h \
src/io/io_private.h $(INC_DIR)/dynext.h $(INC_DIR)/embed.h \
$(INC_DIR)/oplib/core_ops.h $(INC_DIR)/runcore_api.h
@@ -1567,20 +1548,20 @@
# updates to config.h's version numbers
# .h files are built along with .c
-$(INC_DIR)/oplib/core_ops.h: $(OPS_DIR)/core_ops.c
+$(INC_DIR)/oplib/core_ops.h: src/ops/core_ops.c
-$(OPS_DIR)/core_ops.c : $(OPS_FILES) $(BUILD_TOOLS_DIR)/ops2c.pl \
+src/ops/core_ops.c : $(OPS_FILES) $(BUILD_TOOLS_DIR)/ops2c.pl \
lib/Parrot/OpsFile.pm lib/Parrot/Op.pm $(INC_DIR)/config.h \
lib/Parrot/OpLib/core.pm lib/Parrot/OpTrans/C.pm \
- $(PMC_INC_DIR)/pmc/pmc_continuation.h
+ include/pmc/pmc_continuation.h
$(PERL) $(BUILD_TOOLS_DIR)/ops2c.pl C --core @no_lines_flag@
-$(OPS_DIR)/core_ops_switch$(O) : $(GENERAL_H_FILES) $(OPS_DIR)/core_ops_switch.c \
- $(PMC_INC_DIR)/pmc/pmc_parrotlibrary.h
+src/ops/core_ops_switch$(O) : $(GENERAL_H_FILES) src/ops/core_ops_switch.c \
+ include/pmc/pmc_parrotlibrary.h
-$(INC_DIR)/oplib/core_ops_switch.h : $(OPS_DIR)/core_ops_switch.c
+$(INC_DIR)/oplib/core_ops_switch.h : src/ops/core_ops_switch.c
-$(OPS_DIR)/core_ops_switch.c : $(OPS_FILES) $(BUILD_TOOLS_DIR)/ops2c.pl \
+src/ops/core_ops_switch.c : $(OPS_FILES) $(BUILD_TOOLS_DIR)/ops2c.pl \
lib/Parrot/OpsFile.pm lib/Parrot/Op.pm $(INC_DIR)/config.h \
lib/Parrot/OpLib/core.pm lib/Parrot/OpTrans/CSwitch.pm \
lib/Parrot/OpTrans/CPrederef.pm
@@ -1924,6 +1905,7 @@
$(RM_F) $(FLUID_FILES_2)
$(RM_RF) lib/Parrot/OpLib
$(RM_F) $(NQP_CLEANUPS)
+ $(RM_F) pirc$(EXE)
prog-clean :
$(RM_F) \
@@ -1942,24 +1924,24 @@
pbc_to_exe.pbc pbc_to_exe.c pbc_to_exe$(O) pbc_to_exe$(EXE) \
parrot_config$(EXE) parrot_config.c parrot_config$(O) parrot_config.pbc \
compilers/imcc/main$(O) \
- $(PDUMP) $(SRC_DIR)/pbc_dump$(O) $(SRC_DIR)/packdump$(O) \
- $(PDB) $(SRC_DIR)/parrot_debugger$(O) \
- $(PBCMERGE) $(SRC_DIR)/pbc_merge$(O) \
- $(DIS) $(SRC_DIR)/pbc_disassemble$(O)
+ $(PDUMP) src/pbc_dump$(O) src/packdump$(O) \
+ $(PDB) src/parrot_debugger$(O) \
+ $(PBCMERGE) src/pbc_merge$(O) \
+ $(DIS) src/pbc_disassemble$(O)
$(RM_F) \
- $(SRC_DIR)/main$(O) \
- $(SRC_DIR)/null_config$(O) \
- $(SRC_DIR)/parrot_config$(O) \
- $(SRC_DIR)/install_config$(O) \
- $(SRC_DIR)/nci_test$(O) \
+ src/main$(O) \
+ src/null_config$(O) \
+ src/parrot_config$(O) \
+ src/install_config$(O) \
+ src/nci_test$(O) \
$(LIBNCI_TEST_SO) \
- $(SRC_DIR)/glut_callbacks$(O) \
+ src/glut_callbacks$(O) \
$(LIBGLUTCB_SO) \
install_config.fpmc
$(PERL) $(BUILD_TOOLS_DIR)/c2str.pl --init
$(RM_F) \
$(STR_FILES) \
- $(SRC_DIR)/string/private_cstring.h "src/pmc/*.c" "include/pmc/pmc_*.h" \
+ src/string/private_cstring.h "src/pmc/*.c" "include/pmc/pmc_*.h" \
"src/pmc/*.dump" vtable.dump "*.def" "*.lib" "*.exp"
archclean: dynoplibs-clean dynpmc-clean dynext-clean
@@ -1977,20 +1959,20 @@
$(INSTALLABLECONFIG) \
$(INSTALLABLENQP) \
compilers/imcc/main$(O) \
- $(PDUMP) $(SRC_DIR)/pbc_dump$(O) $(SRC_DIR)/packdump$(O) \
- $(PDB) $(SRC_DIR)/parrot_debugger$(O) \
- $(PBCMERGE) $(SRC_DIR)/pbc_merge$(O) \
- $(DIS) $(SRC_DIR)/pbc_disassemble$(O) \
+ $(PDUMP) src/pbc_dump$(O) src/packdump$(O) \
+ $(PDB) src/parrot_debugger$(O) \
+ $(PBCMERGE) src/pbc_merge$(O) \
+ $(DIS) src/pbc_disassemble$(O) \
$(PARROT_CONFIG) parrot_config$(O) parrot_config.c \
- $(SRC_DIR)/parrot_config$(O) parrot_config.pbc \
+ src/parrot_config$(O) parrot_config.pbc \
pbc_to_exe$(EXE) pbc_to_exe$(O) pbc_to_exe.pbc \
- $(SRC_DIR)/null_config$(O) \
- $(SRC_DIR)/parrot_config$(O) \
- $(SRC_DIR)/install_config$(O) \
+ src/null_config$(O) \
+ src/parrot_config$(O) \
+ src/install_config$(O) \
install_config.fpmc \
- $(SRC_DIR)/nci_test$(O) \
+ src/nci_test$(O) \
$(LIBNCI_TEST_SO) \
- $(SRC_DIR)/glut_callbacks$(O) \
+ src/glut_callbacks$(O) \
$(LIBGLUTCB_SO) \
$(LIBPARROT_STATIC) \
$(LIBPARROT_SHARED)
@@ -2086,7 +2068,7 @@
$(PERL) tools/dev/opsrenumber.pl $(OPS_FILES)
pmcrenumber :
- $(PERL) tools/dev/pmcrenumber.pl $(SRC_DIR)/pmc/pmc.num
+ $(PERL) tools/dev/pmcrenumber.pl src/pmc/pmc.num
###############################################################################
#
@@ -2103,7 +2085,7 @@
patch :
svn diff
-LINTABLE_CFILES := `echo $(SRC_DIR)/main$(O) $(O_FILES) $(SRC_DIR)/parrot_config$(O) | $(PERL) -pe @PQ at s/\.o/\.c/g at PQ@`
+LINTABLE_CFILES := `echo src/main$(O) $(O_FILES) src/parrot_config$(O) | $(PERL) -pe @PQ at s/\.o/\.c/g at PQ@`
lint : sunlint
@@ -2329,22 +2311,22 @@
COVER_FLAGS := -fprofile-arcs -ftest-coverage
COVER_DIRS := \
- $(SRC_DIR) \
- $(SRC_DIR)/call \
- $(SRC_DIR)/dynoplibs \
- $(SRC_DIR)/dynpmc \
- $(SRC_DIR)/gc \
- $(SRC_DIR)/interp \
- $(SRC_DIR)/ops \
- $(SRC_DIR)/packfile \
- $(SRC_DIR)/pmc \
- $(SRC_DIR)/runcore \
- $(SRC_DIR)/string \
- $(SRC_DIR)/string/charset \
- $(SRC_DIR)/string/encoding \
+ src \
+ src/call \
+ src/dynoplibs \
+ src/dynpmc \
+ src/gc \
+ src/interp \
+ src/ops \
+ src/packfile \
+ src/pmc \
+ src/runcore \
+ src/string \
+ src/string/charset \
+ src/string/encoding \
$(BUILD_DIR) \
$(BUILD_DIR)/t/perl \
- $(IO_DIR) \
+ src/io \
compilers/imcc
cover: \
@@ -2477,7 +2459,7 @@
###############################################################################
release : MANIFEST MANIFEST.generated
- [ -d parrot-$(VERSION) ] || ln -s $(CUR_DIR) parrot-$(VERSION)
+ [ -d parrot-$(VERSION) ] || ln -s . parrot-$(VERSION)
@$(RM_F) MANIFEST.real
mv MANIFEST MANIFEST.real
grep -v DEVELOPING MANIFEST.real > MANIFEST
@@ -2496,24 +2478,24 @@
#
###############################################################################
-exec : $(SRC_DIR)/parrot_config$(O) $(LIBPARROT)
- $(LINK) @ld_out@$(EXEC)$(EXE) $(EXEC)$(O) $(SRC_DIR)/parrot_config$(O) @rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
+exec : src/parrot_config$(O) $(LIBPARROT)
+ $(LINK) @ld_out@$(EXEC)$(EXE) $(EXEC)$(O) src/parrot_config$(O) @rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
###### OS depend targets ##########
# for use by t/pmc/nci.t
-$(SRC_DIR)/nci_test$(O): $(PARROT_H_HEADERS)
+src/nci_test$(O): $(PARROT_H_HEADERS)
-$(LIBNCI_TEST_SO): $(SRC_DIR)/nci_test$(O) $(LIBPARROT)
+$(LIBNCI_TEST_SO): src/nci_test$(O) $(LIBPARROT)
$(LD) $(LD_LOAD_FLAGS) @ncilib_link_extra@ $(LDFLAGS) \
- @ld_out@$@ $(SRC_DIR)/nci_test$(O) $(C_LIBS)
+ @ld_out@$@ src/nci_test$(O) $(C_LIBS)
# for use by runtime/parrot/library/OpenGL.pir
-$(SRC_DIR)/glut_callbacks$(O): $(GENERAL_H_FILES)
+src/glut_callbacks$(O): $(GENERAL_H_FILES)
-$(LIBGLUTCB_SO): $(LIBPARROT) $(SRC_DIR)/glut_callbacks$(O)
+$(LIBGLUTCB_SO): $(LIBPARROT) src/glut_callbacks$(O)
$(LD) $(LD_LOAD_FLAGS) $(LDFLAGS) \
- @ld_out@$@ $(SRC_DIR)/glut_callbacks$(O) \
+ @ld_out@$@ src/glut_callbacks$(O) \
$(ALL_PARROT_LIBS) @opengl_lib@
# emacs etags
@@ -2526,12 +2508,12 @@
-R --exclude=blib --exclude=.svn \
--languages=c,perl --langmap=c:+.h,c:+.pmc,c:+.ops \
-I NOTNULL,NULLOK,ARGIN,ARGMOD,ARGOUT,ARGINOUT,ARGIN_NULLOK,ARGOUT_NULLOK,ARGMOD_NULLOK \
- $(CUR_DIR)
+ .
# this works with an old etags (XEmacs 21.5*)
tags-xemacs: tags.emacs.dummy
$(RM_F) TAGS
- find $(CUR_DIR) \
+ find . \
-name \*.c -o -name \*.h -o -name \*.pmc -o -name \*.ops | etags -l c - -o TAGS
tags.emacs.dummy:
@@ -2546,7 +2528,7 @@
-R --exclude=blib --exclude=.svn \
--languages=c,perl --langmap=c:+.h,c:+.pmc,c:+.ops \
-I NOTNULL,NULLOK,ARGIN,ARGMOD,ARGOUT,ARGINOUT,ARGIN_NULLOK,ARGOUT_NULLOK,ARGMOD_NULLOK \
- $(CUR_DIR)
+ .
$(PERL) $(BUILD_TOOLS_DIR)/addopstags.pl $(OPS_FILES)
tags.vi.dummy:
@@ -2571,13 +2553,13 @@
src/pbc_merge$(O) \
$(PIRC_O_FILES)
-headerizer : $(SRC_DIR)/core_pmcs.c
+headerizer : src/core_pmcs.c
$(PERL) $(BUILD_TOOLS_DIR)/headerizer.pl $(HEADERIZER_O_FILES) compilers/imcc/imcc.y
-apilist: $(SRC_DIR)/core_pmcs.c
+apilist: src/core_pmcs.c
$(PERL) $(BUILD_TOOLS_DIR)/headerizer.pl --macro=PARROT_EXPORT $(HEADERIZER_O_FILES)
-malloclist: $(SRC_DIR)/core_pmcs.c
+malloclist: src/core_pmcs.c
$(PERL) $(BUILD_TOOLS_DIR)/headerizer.pl --macro=PARROT_MALLOC $(HEADERIZER_O_FILES)
include runtime/parrot/library/Makefile.mak
Modified: branches/one_make/lib/Parrot/Configure/Compiler.pm
==============================================================================
--- branches/one_make/lib/Parrot/Configure/Compiler.pm Thu Dec 31 00:56:11 2009 (r43329)
+++ branches/one_make/lib/Parrot/Configure/Compiler.pm Thu Dec 31 00:58:05 2009 (r43330)
@@ -250,20 +250,20 @@
For instance:
- #IF(win32): $(SRC_DIR)/atomic/gcc_x86$(O)
+ #IF(win32): src/atomic/gcc_x86$(O)
will be included if the platform is win32.
- #IF(cpuarch==i386): $(SRC_DIR)/atomic/gcc_x86$(O)
+ #IF(cpuarch==i386): src/atomic/gcc_x86$(O)
will be included if the value of the config key "cpuarch" is "i386".
- #IF(cpuarch==i386): $(SRC_DIR)/atomic/gcc_x86$(O)
- #ELSIF(cpuarch==sparcv9): $(SRC_DIR)/atomic/sparc_v9.s
+ #IF(cpuarch==i386): src/atomic/gcc_x86$(O)
+ #ELSIF(cpuarch==sparcv9): src/atomic/sparc_v9.s
#ELSE:
-will include " $(SRC_DIR)/atomic/gcc_x86$(O)" if the config key "cpuarch" is
-ste to "i386", will include " $(SRC_DIR)/atomic/sparc_v9.s" instead if
+will include " src/atomic/gcc_x86$(O)" if the config key "cpuarch" is
+ste to "i386", will include " src/atomic/sparc_v9.s" instead if
"cpuarch" is set to "sparcv9", and will include an empty line otherwise.
#IF(win32 and glut and not cygwin):
More information about the parrot-commits
mailing list