Author: jhoblitt
Date: Wed Jan 11 03:10:22 2006
New Revision: 11081

Modified:
   trunk/config/gen/makefiles/root.in
Log:
convert root.in to @foo@ interpolation syntax

Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in  (original)
+++ trunk/config/gen/makefiles/root.in  Wed Jan 11 03:10:22 2006
@@ -14,20 +14,20 @@
 #
 ###############################################################################
 
-DEVEL           = ${DEVEL}
-VERSION         = ${VERSION}$(DEVEL)
-SOVERSION       = ${VERSION}
+DEVEL           = @DEVEL@
+VERSION         = @[EMAIL PROTECTED](DEVEL)
+SOVERSION       = @VERSION@
 
 # Override at least PREFIX with the install location if you're going
 # to be using this outside of your build area.
 BUILDPREFIX     =
-PREFIX          = ${prefix}
-EXEC_PREFIX     = ${exec_prefix}
+PREFIX          = @prefix@
+EXEC_PREFIX     = @exec_prefix@
 DESTDIR         =
-BIN_DIR         = ${bin_dir}
-LIB_DIR         = ${lib_dir}
-INCLUDE_DIR     = ${include_dir}
-DOC_DIR         = ${doc_dir}
+BIN_DIR         = @bin_dir@
+LIB_DIR         = @lib_dir@
+INCLUDE_DIR     = @include_dir@
+DOC_DIR         = @doc_dir@
 
 
 ###############################################################################
@@ -51,7 +51,7 @@ CUR_DIR         = .
 IMCC_DIR        = compilers/imcc
 
 # directory for header files
-INC_DIR         = ${inc}
+INC_DIR         = @inc@
 
 # directory for the IO subsystem
 IO_DIR          = src/io
@@ -69,7 +69,7 @@ PF_DIR          = src/packfile
 SRC_DIR         = src
 
 # revision control
-#CONDITIONED_LINE(SVN_ENTRIES):SVN_ENTRIES=${SVN_ENTRIES}
+#CONDITIONED_LINE(SVN_ENTRIES):[EMAIL PROTECTED]@
 #INVERSE_CONDITIONED_LINE(SVN_ENTRIES):SVN_ENTRIES=
 
 ###############################################################################
@@ -82,26 +82,26 @@ SRC_DIR         = src
 #
 ###############################################################################
 
-RM_F       = ${rm_f}
-RM_RF      = ${rm_rf}
-AR_CR      = ${ar} ${ar_flags}
-RANLIB     = ${ranlib}
-PERL       = ${perl}
-CP         = ${cp}
-TOUCH      = ${touch}
-YACC       = ${yacc}
-LEX        = ${lex}
-MKDIR      = ${mkdir}
-CC         = ${cc}
-CC_INC     = ${cc_inc}
-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}
+RM_F       = @rm_f@
+RM_RF      = @rm_rf@
+AR_CR      = @ar@ @ar_flags@
+RANLIB     = @ranlib@
+PERL       = @perl@
+CP         = @cp@
+TOUCH      = @touch@
+YACC       = @yacc@
+LEX        = @lex@
+MKDIR      = @mkdir@
+CC         = @cc@
+CC_INC     = @cc_inc@
+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@
 
 LINT       = splint
 # note: +distinctinternalnames with +externalnamelen at 8 characters
@@ -131,16 +131,16 @@ INNO_SETUP = iscc
 #
 ###############################################################################
 
-O               = ${o}
-EXE             = ${exe}
-SHARE_EXT       = ${share_ext}
-LOAD_EXT        = ${load_ext}
-A               = ${a}
-LD_SHARE_FLAGS  = ${ld_share_flags}
-LD_LOAD_FLAGS   = ${ld_load_flags}
+O               = @o@
+EXE             = @exe@
+SHARE_EXT       = @share_ext@
+LOAD_EXT        = @load_ext@
+A               = @a@
+LD_SHARE_FLAGS  = @ld_share_flags@
+LD_LOAD_FLAGS   = @ld_load_flags@
 
 # generated by config/init/headers.pl
-NONGEN_HEADERS  = ${TEMP_nongen_headers}
+NONGEN_HEADERS  = @TEMP_nongen_headers@
 
 ###############################################################################
 #
@@ -215,7 +215,7 @@ GEN_CONFIGS = \
 
 GEN_PASM_INCLUDES = \
        runtime/parrot/include/signal.pasm \
-       ${TEMP_gen_pasm_includes}
+       @TEMP_gen_pasm_includes@
 
 STICKY_FILES = $(GEN_CONFIGS) $(GEN_MAKEFILES) myconfig $(GEN_PASM_INCLUDES)
 
@@ -345,15 +345,15 @@ AST_O_FILES = \
        $(AST_DIR)/node$(O)
 
 # generated list of header files
-GENERAL_H_FILES   = $(NONGEN_HEADERS) $(GEN_HEADERS) ${TEMP_cg_h}
+GENERAL_H_FILES   = $(NONGEN_HEADERS) $(GEN_HEADERS) @TEMP_cg_h@
 
 ALL_H_FILES       = $(GENERAL_H_FILES)
 
-CHARSET_O_FILES   = ${TEMP_charset_o}
-CLASS_PMC_FILES   = ${TEMP_pmc_classes_pmc}
-CLASS_O_FILES     = ${TEMP_pmc_classes_o}
-CLASS_STR_FILES   = ${TEMP_pmc_classes_str}
-ENCODING_O_FILES  = ${TEMP_encoding_o}
+CHARSET_O_FILES   = @TEMP_charset_o@
+CLASS_PMC_FILES   = @TEMP_pmc_classes_pmc@
+CLASS_O_FILES     = @TEMP_pmc_classes_o@
+CLASS_STR_FILES   = @TEMP_pmc_classes_str@
+ENCODING_O_FILES  = @TEMP_encoding_o@
 
 
 IO_O_FILES = \
@@ -395,7 +395,7 @@ INTERP_O_FILES = \
        $(SRC_DIR)/hash$(O) \
        $(SRC_DIR)/core_pmcs$(O) \
 #CONDITIONED_LINE(platform_asm):       $(SRC_DIR)/platform_asm$(O) \
-       $(SRC_DIR)/platform$(O) ${TEMP_jit_o} \
+       $(SRC_DIR)/platform$(O) @TEMP_jit_o@ \
        $(SRC_DIR)/intlist$(O) \
        $(SRC_DIR)/list$(O) \
        $(SRC_DIR)/library$(O) \
@@ -436,10 +436,10 @@ INTERP_O_FILES = \
        $(PF_DIR)/pf_items$(O) \
        $(OPS_DIR)/core_ops$(O) \
        $(OPS_DIR)/core_ops_switch$(O) \
-       ${asmfun_o} \
-       ${TEMP_cg_o} \
-       ${TEMP_exec_o} \
-       ${TEMP_gc_o}
+       @asmfun_o@ \
+       @TEMP_cg_o@ \
+       @TEMP_exec_o@ \
+       @TEMP_gc_o@
 
 O_FILES = \
        $(INTERP_O_FILES) \
@@ -449,7 +449,7 @@ O_FILES = \
        $(IMCC_O_FILES) \
        $(AST_O_FILES)
 
-OPS_FILES = ${ops} $(GEN_OPSFILES)
+OPS_FILES = @ops@ $(GEN_OPSFILES)
 
 ###############################################################################
 #
@@ -458,7 +458,7 @@ OPS_FILES = ${ops} $(GEN_OPSFILES)
 ###############################################################################
 
 # Executables
-PARROT            = $(CUR_DIR)/${test_prog}$(EXE)
+PARROT            = $(CUR_DIR)/@[EMAIL PROTECTED](EXE)
 MINIPARROT        = $(CUR_DIR)/miniparrot$(EXE)
 DIS               = $(CUR_DIR)/disassemble$(EXE)
 PDUMP             = $(CUR_DIR)/pdump$(EXE)
@@ -475,15 +475,15 @@ INSTALLABLEPBCMERGE = $(CUR_DIR)/install
 INSTALLABLEPDB      = $(CUR_DIR)/installable_pdb$(EXE)
 
 # Libraries
-LIBPARROT_STATIC  = ${blib_dir}${slash}${libparrot_static}
-#CONDITIONED_LINE(win32):LIBPARROT_SHARED  = ${libparrot_shared}
-#INVERSE_CONDITIONED_LINE(win32):LIBPARROT_SHARED  = 
${blib_dir}${slash}${libparrot_shared}
+LIBPARROT_STATIC  = @blib_dir@@slash@@libparrot_static@
+#CONDITIONED_LINE(win32):LIBPARROT_SHARED  = @libparrot_shared@
+#INVERSE_CONDITIONED_LINE(win32):LIBPARROT_SHARED  = 
@blib_dir@@slash@@libparrot_shared@
 
 # This line controls whether a static or shared library is built
-LIBPARROT         = ${libparrot}
+LIBPARROT         = @libparrot@
 
-#CONDITIONED_LINE(has_icu):ICU_SHARED  = ${icu_shared}
-ALL_PARROT_LIBS   = ${libparrot_ldflags} $(ICU_SHARED) $(C_LIBS)
+#CONDITIONED_LINE(has_icu):ICU_SHARED  = @icu_shared@
+ALL_PARROT_LIBS   = @libparrot_ldflags@ $(ICU_SHARED) $(C_LIBS)
 
 # dynamic extensions
 DYNEXT_DIR        = runtime/parrot/dynext
@@ -497,8 +497,8 @@ LIBNCI_TEST_SO    = $(DYNEXT_DIR)/libnci
 
 # This is set to  MAKE=$make if your $make command doesn't
 # do it for you.
-${make_set_make}
-MAKE = ${make_c}
[EMAIL PROTECTED]@
+MAKE = @make_c@
 
 # These need to be above lines that define suffix rules to be portable
 # (certainly FreeBSD make doesn't grok the .imc.pbc rule otherwise)
@@ -511,7 +511,7 @@ MAKE = ${make_c}
 # 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) :
-       @$(PERL) tools/dev/cc_flags.pl $(CUR_DIR)/CFLAGS $(CC) "" $(CFLAGS) 
-I$(@D) ${cc_o_out}$@ -c $<
+       @$(PERL) tools/dev/cc_flags.pl $(CUR_DIR)/CFLAGS $(CC) "" $(CFLAGS) 
-I$(@D) @[EMAIL PROTECTED]@ -c $<
 
 # XXX These obviously require parrot: had trouble adding parrot as a dependency
 # here, though. Ignored on OS X, at least.
@@ -696,7 +696,7 @@ installable: all $(INSTALLABLEPARROT) $(
 
 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 $(CUR_DIR)/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
@@ -710,22 +710,22 @@ parrot.def : tools/build/parrotdef.pl
 
 $(PARROT) : $(IMCC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
        lib/Parrot/OpLib/core.pm $(SRC_DIR)/parrot_config$(O) \
-       $(MINIPARROT) ${parrot_exe_def}
-       $(LINK) ${ld_out}$@ $(LINKFLAGS) $(LINK_DYNAMIC) \
-       $(IMCC_DIR)/main$(O) ${rpath_blib} $(ALL_PARROT_LIBS) \
-       $(SRC_DIR)/parrot_config$(O) ${ld_parrot_exe_def}
+       $(MINIPARROT) @parrot_exe_def@
+       $(LINK) @[EMAIL PROTECTED]@ $(LINKFLAGS) $(LINK_DYNAMIC) \
+       $(IMCC_DIR)/main$(O) @rpath_blib@ $(ALL_PARROT_LIBS) \
+       $(SRC_DIR)/parrot_config$(O) @ld_parrot_exe_def@
 #
 # TODO build the real miniparrot
 #
 $(MINIPARROT) : $(IMCC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
        lib/Parrot/OpLib/core.pm $(SRC_DIR)/null_config$(O)
-       $(LINK) ${ld_out}$@ $(LINKFLAGS) $(IMCC_DIR)/main$(O) \
-       ${rpath_blib} $(ALL_PARROT_LIBS) $(SRC_DIR)/null_config$(O)
+       $(LINK) @[EMAIL PROTECTED]@ $(LINKFLAGS) $(IMCC_DIR)/main$(O) \
+       @rpath_blib@ $(ALL_PARROT_LIBS) $(SRC_DIR)/null_config$(O)
 
 $(INSTALLABLEPARROT) : $(IMCC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
        lib/Parrot/OpLib/core.pm $(SRC_DIR)/install_config$(O) \
        $(PARROT)
-       $(LINK) ${ld_out}$@ $(LINKFLAGS) \
+       $(LINK) @[EMAIL PROTECTED]@ $(LINKFLAGS) \
        $(IMCC_DIR)/main$(O) \
        $(ALL_PARROT_LIBS) $(SRC_DIR)/install_config$(O)
 
@@ -776,17 +776,17 @@ PARROT_LIBS: \
 
 $(LIBPARROT_STATIC) : $(O_FILES)
        $(RM_F) $@
-       $(MKDIR) ${blib_dir}
+       $(MKDIR) @blib_dir@
        $(RM_F) $(LIBPARROT_STATIC)
-       $(AR_CR) ${ar_out}$@ ${ar_extra} $(O_FILES)
+       $(AR_CR) @[EMAIL PROTECTED]@ @ar_extra@ $(O_FILES)
        $(RANLIB) $@
 
-$(LIBPARROT_SHARED) : $(O_FILES) ${parrot_dll_def}
-       $(MKDIR) ${blib_dir}
+$(LIBPARROT_SHARED) : $(O_FILES) @parrot_dll_def@
+       $(MKDIR) @blib_dir@
        $(RM_F) $(LIBPARROT_SHARED)
-       $(LD) $(LD_SHARE_FLAGS) $(LDFLAGS) ${ld_out}$@ ${libparrot_soname} \
-       $(O_FILES) $(C_LIBS) $(ICU_SHARED) ${ld_parrot_dll_def}
-#CONDITIONED_LINE(libparrot_shared_alias):     ( cd ${blib_dir} ; ln -sf 
${libparrot_shared} ${libparrot_shared_alias} )
+       $(LD) $(LD_SHARE_FLAGS) $(LDFLAGS) @[EMAIL PROTECTED]@ 
@libparrot_soname@ \
+       $(O_FILES) $(C_LIBS) $(ICU_SHARED) @ld_parrot_dll_def@
+#CONDITIONED_LINE(libparrot_shared_alias):     ( cd @blib_dir@ ; ln -sf 
@libparrot_shared@ @libparrot_shared_alias@ )
 
 
 #
@@ -796,12 +796,12 @@ $(LIBPARROT_SHARED) : $(O_FILES) ${parro
 $(SRC_DIR)/pdb$(O) : $(GENERAL_H_FILES)
 
 $(PDB) : $(SRC_DIR)/pdb$(O) $(LIBPARROT)
-       $(LINK) ${ld_out}$@ \
+       $(LINK) @[EMAIL PROTECTED]@ \
        $(SRC_DIR)/pdb$(O) \
-       $(LINKFLAGS) ${rpath_blib} $(ALL_PARROT_LIBS)
+       $(LINKFLAGS) @rpath_blib@ $(ALL_PARROT_LIBS)
 
 $(INSTALLABLEPDB) : $(SRC_DIR)/pdb$(O) $(LIBPARROT)
-       $(LINK) ${ld_out}$@ \
+       $(LINK) @[EMAIL PROTECTED]@ \
        $(SRC_DIR)/pdb$(O) \
        $(LINKFLAGS) $(ALL_PARROT_LIBS)
 
@@ -812,12 +812,12 @@ $(INSTALLABLEPDB) : $(SRC_DIR)/pdb$(O) $
 $(SRC_DIR)/disassemble$(O) : $(GENERAL_H_FILES)
 
 $(DIS) : $(SRC_DIR)/disassemble$(O) $(LIBPARROT)
-       $(LINK) ${ld_out}$@ \
+       $(LINK) @[EMAIL PROTECTED]@ \
        $(SRC_DIR)/disassemble$(O) \
-       $(LINKFLAGS) ${rpath_blib} $(ALL_PARROT_LIBS)
+       $(LINKFLAGS) @rpath_blib@ $(ALL_PARROT_LIBS)
 
 $(INSTALLABLEDIS) : $(SRC_DIR)/disassemble$(O) $(LIBPARROT)
-       $(LINK) ${ld_out}$@ \
+       $(LINK) @[EMAIL PROTECTED]@ \
        $(SRC_DIR)/disassemble$(O) \
        $(LINKFLAGS) $(ALL_PARROT_LIBS)
 
@@ -826,24 +826,24 @@ $(INSTALLABLEDIS) : $(SRC_DIR)/disassemb
 #
 
 $(PDUMP) : $(SRC_DIR)/pdump$(O) $(SRC_DIR)/packdump$(O) $(LIBPARROT)
-       $(LINK) ${ld_out}$@ \
+       $(LINK) @[EMAIL PROTECTED]@ \
        $(SRC_DIR)/pdump$(O) \
-       $(SRC_DIR)/packdump$(O) $(LINKFLAGS) ${rpath_blib} $(ALL_PARROT_LIBS)
+       $(SRC_DIR)/packdump$(O) $(LINKFLAGS) @rpath_blib@ $(ALL_PARROT_LIBS)
 
 $(INSTALLABLEPDUMP) : $(SRC_DIR)/pdump$(O) $(SRC_DIR)/packdump$(O) $(LIBPARROT)
-       $(LINK) ${ld_out}$@ \
+       $(LINK) @[EMAIL PROTECTED]@ \
        $(SRC_DIR)/pdump$(O) \
        $(SRC_DIR)/packdump$(O) $(LINKFLAGS) $(ALL_PARROT_LIBS)
 
 
 # pbc_info
 $(PINFO) : $(SRC_DIR)/pbc_info$(O) $(LIBPARROT)
-       $(LINK) ${ld_out}$@ \
+       $(LINK) @[EMAIL PROTECTED]@ \
        $(SRC_DIR)/pbc_info$(O) \
-       $(LINKFLAGS) ${rpath_blib} $(ALL_PARROT_LIBS)
+       $(LINKFLAGS) @rpath_blib@ $(ALL_PARROT_LIBS)
 
 $(INSTALLABLEPINFO) : $(SRC_DIR)/pbc_info$(O) $(LIBPARROT)
-       $(LINK) ${ld_out}$@ \
+       $(LINK) @[EMAIL PROTECTED]@ \
        $(SRC_DIR)/pbc_info$(O) \
        $(LINKFLAGS) $(ALL_PARROT_LIBS)
 
@@ -852,13 +852,13 @@ $(INSTALLABLEPINFO) : $(SRC_DIR)/pbc_inf
 #
 
 $(PBCMERGE) : $(SRC_DIR)/pbc_merge$(O) $(LIBPARROT) 
$(SRC_DIR)/parrot_config$(O)
-       $(LINK) ${ld_out}$@ \
+       $(LINK) @[EMAIL PROTECTED]@ \
        $(SRC_DIR)/pbc_merge$(O) \
        $(SRC_DIR)/parrot_config$(O) \
-       $(LINKFLAGS) $(LINK_DYNAMIC) ${rpath_blib} $(ALL_PARROT_LIBS)
+       $(LINKFLAGS) $(LINK_DYNAMIC) @rpath_blib@ $(ALL_PARROT_LIBS)
 
 $(INSTALLABLEPBCMERGE) : $(SRC_DIR)/pbc_merge$(O) $(LIBPARROT)
-       $(LINK) ${ld_out}$@ \
+       $(LINK) @[EMAIL PROTECTED]@ \
        $(SRC_DIR)/pbc_merge$(O) \
        $(SRC_DIR)/install_config$(O) \
        $(LINKFLAGS) $(ALL_PARROT_LIBS)
@@ -934,24 +934,24 @@ $(SRC_DIR)/list$(O) : $(GENERAL_H_FILES)
 
 $(SRC_DIR)/library$(O) : $(GENERAL_H_FILES)
 
-$(SRC_DIR)/jit$(O) : $(GENERAL_H_FILES) ${TEMP_jit_h} $(INC_DIR)/jit_emit.h
+$(SRC_DIR)/jit$(O) : $(GENERAL_H_FILES) @TEMP_jit_h@ $(INC_DIR)/jit_emit.h
 
-$(SRC_DIR)/jit_debug$(O) : $(GENERAL_H_FILES) ${TEMP_jit_h}
+$(SRC_DIR)/jit_debug$(O) : $(GENERAL_H_FILES) @TEMP_jit_h@
 
-$(SRC_DIR)/jit_debug_xcoff$(O) : $(GENERAL_H_FILES) ${TEMP_jit_h}
+$(SRC_DIR)/jit_debug_xcoff$(O) : $(GENERAL_H_FILES) @TEMP_jit_h@
 
-$(SRC_DIR)/jit_cpu$(O) : $(GENERAL_H_FILES) ${TEMP_jit_h} $(INC_DIR)/jit_emit.h
+$(SRC_DIR)/jit_cpu$(O) : $(GENERAL_H_FILES) @TEMP_jit_h@ $(INC_DIR)/jit_emit.h
 
-$(SRC_DIR)/exec$(O) : $(GENERAL_H_FILES) ${TEMP_exec_h} ${TEMP_jit_h} 
$(INC_DIR)/jit_emit.h
+$(SRC_DIR)/exec$(O) : $(GENERAL_H_FILES) @TEMP_exec_h@ @TEMP_jit_h@ 
$(INC_DIR)/jit_emit.h
 
-$(SRC_DIR)/exec_cpu$(O) : $(GENERAL_H_FILES) ${TEMP_exec_h} ${TEMP_jit_h} 
$(INC_DIR)/jit_emit.h
+$(SRC_DIR)/exec_cpu$(O) : $(GENERAL_H_FILES) @TEMP_exec_h@ @TEMP_jit_h@ 
$(INC_DIR)/jit_emit.h
 
 $(INC_DIR)/extend_vtable.h $(SRC_DIR)/extend_vtable.c $(SRC_DIR)/vtable.h : 
vtable.tbl $(BUILD_TOOLS_DIR)/vtable_extend.pl lib/Parrot/Vtable.pm
        $(PERL) $(BUILD_TOOLS_DIR)/vtable_extend.pl
 
-$(SRC_DIR)/exec_start$(O) : $(GENERAL_H_FILES) ${TEMP_exec_h}
+$(SRC_DIR)/exec_start$(O) : $(GENERAL_H_FILES) @TEMP_exec_h@
 
-$(SRC_DIR)/exec_save$(O) : $(GENERAL_H_FILES) ${TEMP_exec_h}
+$(SRC_DIR)/exec_save$(O) : $(GENERAL_H_FILES) @TEMP_exec_h@
 
 $(SRC_DIR)/key$(O) : $(GENERAL_H_FILES)
 
@@ -1000,7 +1000,7 @@ $(SRC_DIR)/thread$(O) : $(GENERAL_H_FILE
 $(SRC_DIR)/extend$(O) : $(GENERAL_H_FILES) $(INC_DIR)/extend.h
 
 $(SRC_DIR)/interpreter$(O) : $(SRC_DIR)/interpreter.c $(GENERAL_H_FILES) \
-       ${TEMP_jit_h}
+       @TEMP_jit_h@
 
 $(SRC_DIR)/inter_call$(O) : $(SRC_DIR)/inter_call.c $(GENERAL_H_FILES) \
        $(SRC_DIR)/inter_call.str
@@ -1103,15 +1103,15 @@ $(OPS_DIR)/core_ops_switch.c $(INC_DIR)/
 
 tools/build/parrotdef.pl : $(CLASS_PMC_FILES)
 
-${TEMP_cg_c}
[EMAIL PROTECTED]@
 
-${TEMP_gc_c}
[EMAIL PROTECTED]@
 
-${TEMP_pmc_build}
[EMAIL PROTECTED]@
 
-${TEMP_charset_build}
[EMAIL PROTECTED]@
 
-${TEMP_encoding_build}
[EMAIL PROTECTED]@
 
 # $(STICKY_FILES) : Configure.pl
 #      $(PERL) Configure.pl
@@ -1119,16 +1119,16 @@ ${TEMP_encoding_build}
 $(INC_DIR)/vtable.h : vtable.tbl $(BUILD_TOOLS_DIR)/vtable_h.pl 
lib/Parrot/Vtable.pm
        $(PERL) $(BUILD_TOOLS_DIR)/vtable_h.pl
 
-$(INC_DIR)/jit_emit.h : $(SRC_DIR)/jit/${jitcpuarch}/jit_emit.h
-       $(CP) $(SRC_DIR)/jit/${jitcpuarch}/jit_emit.h $(INC_DIR)/jit_emit.h
-$(INC_DIR)/exec_dep.h : $(SRC_DIR)/jit/${jitcpuarch}/exec_dep.h
-       $(CP) $(SRC_DIR)/jit/${jitcpuarch}/exec_dep.h $(INC_DIR)/exec_dep.h
+$(INC_DIR)/jit_emit.h : $(SRC_DIR)/jit/@jitcpuarch@/jit_emit.h
+       $(CP) $(SRC_DIR)/jit/@jitcpuarch@/jit_emit.h $(INC_DIR)/jit_emit.h
+$(INC_DIR)/exec_dep.h : $(SRC_DIR)/jit/@jitcpuarch@/exec_dep.h
+       $(CP) $(SRC_DIR)/jit/@jitcpuarch@/exec_dep.h $(INC_DIR)/exec_dep.h
 $(SRC_DIR)/jit_cpu.c : lib/Parrot/OpLib/core.pm $(INC_DIR)/jit_emit.h \
-       $(SRC_DIR)/jit/${jitcpuarch}/core.jit $(BUILD_TOOLS_DIR)/jit2h.pl
-       $(PERL) $(BUILD_TOOLS_DIR)/jit2h.pl ${jitcpuarch} $(SRC_DIR)/jit_cpu.c
+       $(SRC_DIR)/jit/@jitcpuarch@/core.jit $(BUILD_TOOLS_DIR)/jit2h.pl
+       $(PERL) $(BUILD_TOOLS_DIR)/jit2h.pl @jitcpuarch@ $(SRC_DIR)/jit_cpu.c
 $(SRC_DIR)/exec_cpu.c : lib/Parrot/OpLib/core.pm $(INC_DIR)/jit_emit.h \
-       $(SRC_DIR)/jit/${jitcpuarch}/core.jit ${TEMP_exec_h} 
$(INC_DIR)/exec_dep.h $(BUILD_TOOLS_DIR)/jit2h.pl
-       $(PERL) $(BUILD_TOOLS_DIR)/jit2h.pl ${jitcpuarch} $(SRC_DIR)/exec_cpu.c
+       $(SRC_DIR)/jit/@jitcpuarch@/core.jit @TEMP_exec_h@ 
$(INC_DIR)/exec_dep.h $(BUILD_TOOLS_DIR)/jit2h.pl
+       $(PERL) $(BUILD_TOOLS_DIR)/jit2h.pl @jitcpuarch@ $(SRC_DIR)/exec_cpu.c
 
 # imcc file dependencies
 #
@@ -1443,7 +1443,7 @@ clean : \
        compilers-clean \
        smoke-clean \
        editor-clean
-       ${TEMP_cg_r}
+       @TEMP_cg_r@
        $(RM_F) chartypes "*.s" "*~" $(FLUID_FILES)
 
 prog-clean :
@@ -1553,7 +1553,7 @@ realclean : clean
 distclean : realclean
 
 svnclobber :
-       $(PERL) "-MExtUtils::Manifest=filecheck" -le ${PQ}sub 
ExtUtils::Manifest::_maniskip{sub{0}};$$ExtUtils::Manifest::Quiet=1; do { 
unlink $$_ unless $$_ =~ m!(?:\.svn)! } for filecheck()${PQ}
+       $(PERL) "-MExtUtils::Manifest=filecheck" -le @[EMAIL PROTECTED] 
ExtUtils::Manifest::_maniskip{sub{0}};$$ExtUtils::Manifest::Quiet=1; do { 
unlink $$_ unless $$_ =~ m!(?:\.svn)! } for filecheck()@PQ@
 
 reconfig : clean
        $(PERL) Configure.pl --reconfig
@@ -1581,11 +1581,11 @@ patch :
 
 
 lint : $(PARROT)
-       $(LINT) $(CC_INC) ${cc_hasjit} "-Isrc/classes" $(LINTFLAGS) $(LINTOPTS) 
`echo $(O_FILES) | sed ${PQ}s/\.o/\.c/g${PQ}`
+       $(LINT) $(CC_INC) @cc_hasjit@ "-Isrc/classes" $(LINTFLAGS) $(LINTOPTS) 
`echo $(O_FILES) | sed @[EMAIL PROTECTED]/\.o/\.c/[EMAIL PROTECTED]@`
        $(LINT) $(CC_INC) $(LINTFLAGS) $(LINTOPTS) $(IMCC_DIR)/main.c
 
 lint2 : $(PARROT)
-       $(LINT) $(CC_INC) ${cc_hasjit} "-Isrc/classes" $(LINTFLAGS2) 
$(LINTOPTS) `echo $(O_FILES) | sed ${PQ}s/\.o/\.c/g${PQ}`
+       $(LINT) $(CC_INC) @cc_hasjit@ "-Isrc/classes" $(LINTFLAGS2) $(LINTOPTS) 
`echo $(O_FILES) | sed @[EMAIL PROTECTED]/\.o/\.c/[EMAIL PROTECTED]@`
        $(LINT) $(CC_INC) $(LINTFLAGS2) $(LINTOPTS) $(IMCC_DIR)/main.c
 
 
@@ -1624,7 +1624,7 @@ release : MANIFEST MANIFEST.generated
 rpms : release
        sudo cp parrot-$(VERSION).tar.gz /usr/src/*/SOURCES
        sudo cp parrot.spec /usr/src/*/SPECS
-       cd /usr/src/*/SPECS ${make_and} sudo rpm -ba parrot.spec
+       cd /usr/src/*/SPECS @make_and@ sudo rpm -ba parrot.spec
 
 win32-inno-installer : world install
        $(PERL) tools/dev/mk_inno.pl --version=$(VERSION) --prefix=$(PREFIX) 
@@ -1654,14 +1654,14 @@ win32-inno-installer : world install
 ###############################################################################
 
 exec : $(SRC_DIR)/exec_start$(O) $(SRC_DIR)/parrot_config$(O) $(LIBPARROT)
-       $(LINK) ${ld_out}$(EXEC)$(EXE) $(LINKFLAGS) $(EXEC)$(O) 
$(SRC_DIR)/exec_start$(O) $(SRC_DIR)/parrot_config$(O) ${rpath_blib} 
$(ALL_PARROT_LIBS)
+       $(LINK) @[EMAIL PROTECTED](EXEC)$(EXE) $(LINKFLAGS) $(EXEC)$(O) 
$(SRC_DIR)/exec_start$(O) $(SRC_DIR)/parrot_config$(O) @rpath_blib@ 
$(ALL_PARROT_LIBS)
 
 ###### OS depend targets ##########
 
 # for use by t/pmc/nci.t
 $(LIBNCI_TEST_SO): $(SRC_DIR)/nci_test$(O)
-       $(LD) $(LD_LOAD_FLAGS) ${ncilib_link_extra} $(LDFLAGS) \
-       ${ld_out}$@ $(SRC_DIR)/nci_test$(O) $(C_LIBS)
+       $(LD) $(LD_LOAD_FLAGS) @ncilib_link_extra@ $(LDFLAGS) \
+       @[EMAIL PROTECTED]@ $(SRC_DIR)/nci_test$(O) $(C_LIBS)
 
 # vim ctags
 # this needs exuberant-ctags

Reply via email to