[svn:parrot] r43392 - in branches/one_make: config/gen/makefiles lib/Parrot/Configure

coke at svn.parrot.org coke at svn.parrot.org
Wed Jan 6 01:56:46 UTC 2010


Author: coke
Date: Wed Jan  6 01:56:43 2010
New Revision: 43392
URL: https://trac.parrot.org/parrot/changeset/43392

Log:
Don't use := in makefiles, remove := > = translation.

Modified:
   branches/one_make/config/gen/makefiles/docs.in
   branches/one_make/config/gen/makefiles/dynoplibs.in
   branches/one_make/config/gen/makefiles/dynpmc.in
   branches/one_make/config/gen/makefiles/editor.in
   branches/one_make/config/gen/makefiles/ext.in
   branches/one_make/config/gen/makefiles/root.in
   branches/one_make/lib/Parrot/Configure/Compiler.pm

Modified: branches/one_make/config/gen/makefiles/docs.in
==============================================================================
--- branches/one_make/config/gen/makefiles/docs.in	Wed Jan  6 01:47:11 2010	(r43391)
+++ branches/one_make/config/gen/makefiles/docs.in	Wed Jan  6 01:56:43 2010	(r43392)
@@ -2,17 +2,17 @@
 # $Id$
 
 # Setup of some commands
-PERL    := @perl@
-CHMOD   := @chmod@
-MKPATH  := @mkpath@
-TOUCH   := @touch@
-RM_F    := @rm_f@
-RM_RF   := @rm_rf@
-PERLDOC := @perldoc@
-VERSION := @VERSION@@DEVEL@
+PERL    = @perl@
+CHMOD   = @chmod@
+MKPATH  = @mkpath@
+TOUCH   = @touch@
+RM_F    = @rm_f@
+RM_RF   = @rm_rf@
+PERLDOC = @perldoc@
+VERSION = @VERSION@@DEVEL@
 
 # long list of .pod files
-POD := @TEMP_pod@
+POD = @TEMP_pod@
 
 #
 # Targets

Modified: branches/one_make/config/gen/makefiles/dynoplibs.in
==============================================================================
--- branches/one_make/config/gen/makefiles/dynoplibs.in	Wed Jan  6 01:47:11 2010	(r43391)
+++ branches/one_make/config/gen/makefiles/dynoplibs.in	Wed Jan  6 01:56:43 2010	(r43392)
@@ -1,28 +1,28 @@
 # Copyright (C) 2003-2009, Parrot Foundation.
 # $Id$
 
-PERL          := @perl@
-RM_F          := @rm_f@
-CP            := @cp@
-CHMOD         := @chmod@
-LOAD_EXT      := @load_ext@
-BUILD_DIR     := @build_dir@
-RECONFIGURE   := $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
-INSTALL_DIR   := $(BUILD_DIR)/runtime/parrot/dynext
-O             := @o@
-CC            := @cc@
-LD            := @ld@
-LDFLAGS       := @ldflags@ @ld_debug@ @rpath_blib@ @linkflags@
-LD_LOAD_FLAGS := @ld_load_flags@
-CFLAGS        := @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@
-LIBPARROT     := @libparrot_ldflags@
-
-BUILD_TOOLS_DIR := $(BUILD_DIR)@slash at tools@slash at build
-OPS2C           := $(PERL) -I$(BUILD_DIR)@slash at lib $(BUILD_TOOLS_DIR)@slash at ops2c.pl
-INCLUDES        := -I$(BUILD_DIR)@slash at include -I at build_dir@@slash at src@slash at pmc
-LINKARGS        := $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @icu_shared@ @libs@
+PERL          = @perl@
+RM_F          = @rm_f@
+CP            = @cp@
+CHMOD         = @chmod@
+LOAD_EXT      = @load_ext@
+BUILD_DIR     = @build_dir@
+RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
+INSTALL_DIR   = $(BUILD_DIR)/runtime/parrot/dynext
+O             = @o@
+CC            = @cc@
+LD            = @ld@
+LDFLAGS       = @ldflags@ @ld_debug@ @rpath_blib@ @linkflags@
+LD_LOAD_FLAGS = @ld_load_flags@
+CFLAGS        = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@
+LIBPARROT     = @libparrot_ldflags@
+
+BUILD_TOOLS_DIR = $(BUILD_DIR)@slash at tools@slash at build
+OPS2C           = $(PERL) -I$(BUILD_DIR)@slash at lib $(BUILD_TOOLS_DIR)@slash at ops2c.pl
+INCLUDES        = -I$(BUILD_DIR)@slash at include -I at build_dir@@slash at src@slash at pmc
+LINKARGS        = $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @icu_shared@ @libs@
 
-OPS_TARGETS := \
+OPS_TARGETS = \
 #IF(cg_flag):  obscure_ops_cg$(LOAD_EXT) \
 #IF(cg_flag):  obscure_ops_cgp$(LOAD_EXT) \
   obscure_ops$(LOAD_EXT) \
@@ -32,7 +32,7 @@
   math_ops$(LOAD_EXT) \
   math_ops_switch$(LOAD_EXT)
 
-CLEANUPS := \
+CLEANUPS = \
   "*.c" \
   "*.h" \
 #IF(o):  "*@o@" \

Modified: branches/one_make/config/gen/makefiles/dynpmc.in
==============================================================================
--- branches/one_make/config/gen/makefiles/dynpmc.in	Wed Jan  6 01:47:11 2010	(r43391)
+++ branches/one_make/config/gen/makefiles/dynpmc.in	Wed Jan  6 01:56:43 2010	(r43392)
@@ -1,33 +1,33 @@
 # Copyright (C) 2003-2009, Parrot Foundation.
 # $Id$
 
-PERL          := @perl@
-RM_F          := @rm_f@
-CP            := @cp@
-CHMOD         := @chmod@
-LOAD_EXT      := @load_ext@
-BUILD_DIR     := @build_dir@
-RECONFIGURE   := $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
-INSTALL_DIR   := $(BUILD_DIR)@slash at runtime@slash at parrot@slash at dynext
-O             := @o@
-CC            := @cc@
-LD            := @ld@
-LDFLAGS       := @ldflags@ @ld_debug@ @rpath_blib@
-LD_LOAD_FLAGS := @ld_load_flags@
-CFLAGS        := @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@
-LIBPARROT     := @libparrot_ldflags@
-
-BUILD_TOOLS_DIR := $(BUILD_DIR)@slash at tools@slash at build
-BUILD_LIB_DIR   := $(BUILD_DIR)@slash at blib@slash at lib
-PMC2C           := $(PERL) $(BUILD_TOOLS_DIR)@slash at pmc2c.pl
-INCLUDES        := -I$(BUILD_DIR)@slash at include -I at build_dir@@slash at include@slash at pmc
-LINKARGS        := $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @icu_shared@ @libs@
+PERL          = @perl@
+RM_F          = @rm_f@
+CP            = @cp@
+CHMOD         = @chmod@
+LOAD_EXT      = @load_ext@
+BUILD_DIR     = @build_dir@
+RECONFIGURE   = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
+INSTALL_DIR   = $(BUILD_DIR)@slash at runtime@slash at parrot@slash at dynext
+O             = @o@
+CC            = @cc@
+LD            = @ld@
+LDFLAGS       = @ldflags@ @ld_debug@ @rpath_blib@
+LD_LOAD_FLAGS = @ld_load_flags@
+CFLAGS        = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@
+LIBPARROT     = @libparrot_ldflags@
+
+BUILD_TOOLS_DIR = $(BUILD_DIR)@slash at tools@slash at build
+BUILD_LIB_DIR   = $(BUILD_DIR)@slash at blib@slash at lib
+PMC2C           = $(PERL) $(BUILD_TOOLS_DIR)@slash at pmc2c.pl
+INCLUDES        = -I$(BUILD_DIR)@slash at include -I at build_dir@@slash at include@slash at pmc
+LINKARGS        = $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @icu_shared@ @libs@
 
-PMC2CD := $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --dump
-PMC2CC := $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --c
+PMC2CD = $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --dump
+PMC2CC = $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --c
 
 # add your dynamic pmcs here
-PMC_TARGETS := \
+PMC_TARGETS = \
   dynlexpad$(LOAD_EXT) \
   foo_group$(LOAD_EXT) \
   rotest$(LOAD_EXT) \
@@ -36,7 +36,7 @@
 #IF(has_crypto):  digest_group$(LOAD_EXT) \
   subproxy$(LOAD_EXT)
 
-PMCS_DIGEST := \
+PMCS_DIGEST = \
   md2.pmc \
   md4.pmc \
   md5.pmc \
@@ -46,7 +46,7 @@
   sha256.pmc \
   sha512.pmc
 
-OBJS_DIGEST := \
+OBJS_DIGEST = \
   md2$(O) \
   md4$(O) \
   md5$(O) \
@@ -56,23 +56,23 @@
   sha256$(O) \
   sha512$(O)
 
-PMCS_FOO := \
+PMCS_FOO = \
   foo.pmc \
   foo2.pmc
 
-OBJS_FOO := \
+OBJS_FOO = \
   foo$(O) \
   foo2$(O)
 
-#IF(win32 and cc==gcc):LIB_GDBM := -llibgdbm
-#ELSIF(win32):LIB_GDBM := libgdbm.lib
-#ELSE:LIB_GDBM := -lgdbm
-
-#IF(win32 and cc==gcc):LIB_CRYPTO := -lcrypto
-#ELSIF(win32):LIB_CRYPTO := libcrypto.lib
-#ELSE:LIB_CRYPTO := -lcrypto
+#IF(win32 and cc==gcc):LIB_GDBM = -llibgdbm
+#ELSIF(win32):LIB_GDBM = libgdbm.lib
+#ELSE:LIB_GDBM = -lgdbm
+
+#IF(win32 and cc==gcc):LIB_CRYPTO = -lcrypto
+#ELSIF(win32):LIB_CRYPTO = libcrypto.lib
+#ELSE:LIB_CRYPTO = -lcrypto
 
-CLEANUPS := \
+CLEANUPS = \
   "*.c" \
   "pmc_*.h" \
   "*_group.h" \

Modified: branches/one_make/config/gen/makefiles/editor.in
==============================================================================
--- branches/one_make/config/gen/makefiles/editor.in	Wed Jan  6 01:47:11 2010	(r43391)
+++ branches/one_make/config/gen/makefiles/editor.in	Wed Jan  6 01:56:43 2010	(r43392)
@@ -1,16 +1,16 @@
 # Copyright (C) 2005-2009, Parrot Foundation.
 # $Id$
 
-#IF(win32):VIM_DIR     := $(USERPROFILE)/vimfiles
-#ELSE:VIM_DIR     := $(HOME)/.vim
-VIM_FT_DIR  := $(VIM_DIR)/plugin
-VIM_IN_DIR  := $(VIM_DIR)/indent
-VIM_SYN_DIR := $(VIM_DIR)/syntax
-
-PERL   := @perl@
-CP     := @cp@
-MKPATH := @mkpath@
-RM_F   := @rm_f@
+#IF(win32):VIM_DIR     = $(USERPROFILE)/vimfiles
+#ELSE:VIM_DIR     = $(HOME)/.vim
+VIM_FT_DIR  = $(VIM_DIR)/plugin
+VIM_IN_DIR  = $(VIM_DIR)/indent
+VIM_SYN_DIR = $(VIM_DIR)/syntax
+
+PERL   = @perl@
+CP     = @cp@
+MKPATH = @mkpath@
+RM_F   = @rm_f@
 
 default: all
 

Modified: branches/one_make/config/gen/makefiles/ext.in
==============================================================================
--- branches/one_make/config/gen/makefiles/ext.in	Wed Jan  6 01:47:11 2010	(r43391)
+++ branches/one_make/config/gen/makefiles/ext.in	Wed Jan  6 01:56:43 2010	(r43392)
@@ -3,13 +3,13 @@
 
 # setup of commands
 @make_set_make@
-MAKE      := @make@
-PERL      := @perl@
-RM_F      := @rm_f@
+MAKE      = @make@
+PERL      = @perl@
+RM_F      = @rm_f@
 
 # add new languages here
 # remove obsolete languages here
-EXT := \
+EXT = \
     Parrot-Embed
 
 # the default target

Modified: branches/one_make/config/gen/makefiles/root.in
==============================================================================
--- branches/one_make/config/gen/makefiles/root.in	Wed Jan  6 01:47:11 2010	(r43391)
+++ branches/one_make/config/gen/makefiles/root.in	Wed Jan  6 01:56:43 2010	(r43392)
@@ -16,23 +16,23 @@
 #
 ###############################################################################
 
-DEVEL           := @DEVEL@
-VERSION         := @VERSION@$(DEVEL)
-SOVERSION       := @VERSION@
+DEVEL           = @DEVEL@
+VERSION         = @VERSION@$(DEVEL)
+SOVERSION       = @VERSION@
 
-CONFIG_ARGS     := @configure_args@
+CONFIG_ARGS     = @configure_args@
 
 # 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@
-DESTDIR         :=
-BIN_DIR         := @bindir@
-LIB_DIR         := @libdir@
-INCLUDE_DIR     := @includedir@
-DATA_DIR        := @datadir@
-DOC_DIR         := @docdir@
+BUILDPREFIX     =
+PREFIX          = @prefix@
+EXEC_PREFIX     = @exec_prefix@
+DESTDIR         =
+BIN_DIR         = @bindir@
+LIB_DIR         = @libdir@
+INCLUDE_DIR     = @includedir@
+DATA_DIR        = @datadir@
+DOC_DIR         = @docdir@
 VERSION_DIR     = @versiondir@
 
 
@@ -45,16 +45,16 @@
 ###############################################################################
 
 # where we're building parrot from (needed for pbc_to_exe)
-BUILD_DIR := @build_dir@
+BUILD_DIR = @build_dir@
 
 # directory for build tools
-BUILD_TOOLS_DIR := tools/build
+BUILD_TOOLS_DIR = tools/build
 
 # directory for header files
-INC_DIR         := @inc@
+INC_DIR         = @inc@
 
 # directory with Parrot modules
-LIBRARY_DIR     := runtime/parrot/library
+LIBRARY_DIR     = runtime/parrot/library
 
 ###############################################################################
 #
@@ -66,33 +66,33 @@
 #
 ###############################################################################
 
-PERL             := @perl@
-CP               := @cp@
-CHMOD            := @chmod@
-MKPATH           := @mkpath@
-RM_F             := @rm_f@
-RM_RF            := @rm_rf@
-TOUCH            := @touch@
-AR_CR            := @ar@ @ar_flags@
-RANLIB           := @ranlib@
-YACC             := @yacc@
-LEX              := @lex@
-AS               := @as@
-CC               := @cc@
-CC_INC           := @cc_inc@
-C_LIBS           := @libs@
-CC_SHARED        := @cc_shared@
-CFLAGS           := $(CC_INC) @ccflags@ @cc_build_call_frames@ @cc_debug@ @ccwarn@ @cg_flag@ @gc_flag@ @clock_best@ $(CC_SHARED)
-LINK_DYNAMIC     := @link_dynamic@
-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@
+PERL             = @perl@
+CP               = @cp@
+CHMOD            = @chmod@
+MKPATH           = @mkpath@
+RM_F             = @rm_f@
+RM_RF            = @rm_rf@
+TOUCH            = @touch@
+AR_CR            = @ar@ @ar_flags@
+RANLIB           = @ranlib@
+YACC             = @yacc@
+LEX              = @lex@
+AS               = @as@
+CC               = @cc@
+CC_INC           = @cc_inc@
+C_LIBS           = @libs@
+CC_SHARED        = @cc_shared@
+CFLAGS           = $(CC_INC) @ccflags@ @cc_build_call_frames@ @cc_debug@ @ccwarn@ @cg_flag@ @gc_flag@ @clock_best@ $(CC_SHARED)
+LINK_DYNAMIC     = @link_dynamic@
+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@
 
 ###############################################################################
 #
@@ -100,16 +100,16 @@
 #
 ###############################################################################
 
-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.pm
-NONGEN_HEADERS   := @TEMP_nongen_headers@
+NONGEN_HEADERS   = @TEMP_nongen_headers@
 
 include compilers/imcc/Defines.mak
 include compilers/pirc/Defines.mak
@@ -133,7 +133,7 @@
 #
 ###############################################################################
 
-GEN_MAKEFILES := \
+GEN_MAKEFILES = \
     Makefile \
     docs/Makefile \
     compilers/ncigen/Makefile \
@@ -142,7 +142,7 @@
     src/dynoplibs/Makefile \
     src/dynpmc/Makefile
 
-GEN_CONFIGS := \
+GEN_CONFIGS = \
     $(INC_DIR)/config.h \
     $(INC_DIR)/platform.h \
     $(INC_DIR)/platform_interface.h \
@@ -188,13 +188,13 @@
 
 # most of these are generated by config/gen/parrot_include.pm
 
-GEN_PASM_INCLUDES := \
+GEN_PASM_INCLUDES = \
     runtime/parrot/include/signal.pasm \
 #IF(has_opengl):    runtime/parrot/include/opengl_defines.pasm \
 #IF(has_opengl):    $(LIBRARY_DIR)/OpenGL_funcs.pir \
     @TEMP_gen_pasm_includes@
 
-CONFIGURE_GENERATED_FILES := \
+CONFIGURE_GENERATED_FILES = \
     $(GEN_CONFIGS) \
     $(GEN_MAKEFILES) \
     ext/Parrot-Embed/Makefile.PL \
@@ -216,9 +216,9 @@
 #
 ###############################################################################
 
-GEN_OPSFILES :=
+GEN_OPSFILES =
 
-GEN_HEADERS := \
+GEN_HEADERS = \
     $(INC_DIR)/vtable.h \
     $(INC_DIR)/oplib/core_ops.h \
     $(INC_DIR)/oplib/ops.h \
@@ -226,7 +226,7 @@
     $(INC_DIR)/extend_vtable.h \
     $(INC_DIR)/pbcversion.h
 
-GEN_SOURCES := \
+GEN_SOURCES = \
     src/core_ops.c \
     src/nci.c \
     src/core_ops_switch.c \
@@ -235,10 +235,10 @@
     src/install_config.c \
     src/extend_vtable.c
 
-GEN_MODULES := \
+GEN_MODULES = \
     lib/Parrot/OpLib/core.pm
 
-GEN_LIBRARY := \
+GEN_LIBRARY = \
     $(TGE_LIB_PBCS) \
     $(PGE_LIB_PBCS) \
     $(PCT_LIB_PBCS) \
@@ -307,13 +307,13 @@
     $(LIBRARY_DIR)/libpcre.pbc \
     $(LIBRARY_DIR)/postgres.pbc
 
-FLUID_FILES_1 := \
+FLUID_FILES_1 = \
     $(GEN_OPSFILES) \
     $(GEN_HEADERS) \
     $(GEN_SOURCES) \
     $(GEN_MODULES) \
 
-FLUID_FILES_2 := \
+FLUID_FILES_2 = \
     $(GEN_LIBRARY) \
     runtime/parrot/include/parrotlib.pbc
 
@@ -325,7 +325,7 @@
 ###############################################################################
 
 # parrot.h and all the includes it causes to be included
-PARROT_H_HEADERS := \
+PARROT_H_HEADERS = \
         $(INC_DIR)/parrot.h \
         $(INC_DIR)/config.h \
         $(INC_DIR)/settings.h \
@@ -386,15 +386,15 @@
         include/pmc/pmc_callcontext.h
 
 # 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@
 
-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 := \
+IO_O_FILES = \
     src/io/core$(O) \
     src/io/api$(O) \
     src/io/utf8$(O) \
@@ -407,7 +407,7 @@
     src/io/socket_unix$(O) \
     src/io/socket_win32$(O)
 
-INTERP_O_FILES := \
+INTERP_O_FILES = \
     src/string/api$(O) \
     \
     src/ops/core_ops$(O) \
@@ -481,7 +481,7 @@
     @TEMP_gc_o@ \
 #IF(platform_asm):    src/platform_asm$(O) \
 
-OPS_FILES := @ops@ $(GEN_OPSFILES)
+OPS_FILES = @ops@ $(GEN_OPSFILES)
 
 ###############################################################################
 #
@@ -490,45 +490,45 @@
 ###############################################################################
 
 # Executables
-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)
+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   := ./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)
+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@
-#IF(darwin):export DYLD_LIBRARY_PATH := @blib_dir@:$(DYLD_LIBRARY_PATH)
-#IF(win32):LIBPARROT_SHARED  := @libparrot_shared@
-#ELSE:LIBPARROT_SHARED  := @blib_dir@/@libparrot_shared@
+LIBPARROT_STATIC    = @blib_dir@/@libparrot_static@
+#IF(darwin):export DYLD_LIBRARY_PATH = @blib_dir@:$(DYLD_LIBRARY_PATH)
+#IF(win32):LIBPARROT_SHARED  = @libparrot_shared@
+#ELSE:LIBPARROT_SHARED  = @blib_dir@/@libparrot_shared@
 
 # This line controls whether a static or shared library is built
 # by Parrot's make.  It is not useful otherwise (e.g., in
 # lib/Parrot/Config/Generated.pm or config_lib.pasm).
-LIBPARROT           := @libparrot_for_makefile_only@
+LIBPARROT           = @libparrot_for_makefile_only@
 
-#IF(has_icu):ICU_SHARED  := @icu_shared@
-ALL_PARROT_LIBS     := @libparrot_linkflags@ $(ICU_SHARED) $(C_LIBS)
+#IF(has_icu):ICU_SHARED  = @icu_shared@
+ALL_PARROT_LIBS     = @libparrot_linkflags@ $(ICU_SHARED) $(C_LIBS)
 
 # dynamic extensions
-DYNEXT_DIR          := runtime/parrot/dynext
-LIBNCI_TEST_SO      := $(DYNEXT_DIR)/libnci_test$(LOAD_EXT)
-LIBGLUTCB_SO        := $(DYNEXT_DIR)/libglutcb$(LOAD_EXT)
+DYNEXT_DIR          = runtime/parrot/dynext
+LIBNCI_TEST_SO      = $(DYNEXT_DIR)/libnci_test$(LOAD_EXT)
+LIBGLUTCB_SO        = $(DYNEXT_DIR)/libglutcb$(LOAD_EXT)
 
 ###############################################################################
 #
@@ -539,7 +539,7 @@
 # This is set to MAKE=$make if your $make command doesn't
 # do it for you.
 @make_set_make@
-MAKE := @make_c@
+MAKE = @make_c@
 
 # These need to be above lines that define suffix rules to be portable
 # (certainly FreeBSD make doesn't grok the pir.pbc rule otherwise)
@@ -605,7 +605,7 @@
 .c.str : # suffix rule (limited support)
 	$(PERL) $(BUILD_TOOLS_DIR)/c2str.pl $< > $@
 
-STR_FILES := \
+STR_FILES = \
     src/debug.str \
     src/dynext.str \
     src/events.str \
@@ -643,9 +643,9 @@
 	$(PERL) $(BUILD_TOOLS_DIR)/c2str.pl --all
 
 # classes PMC build utils and rules
-PMC2CD := $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --dump @no_lines_flag@
-PMC2CC := $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --c @no_lines_flag@
-PMC2CV := $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --vtable @no_lines_flag@
+PMC2CD = $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --dump @no_lines_flag@
+PMC2CC = $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --c @no_lines_flag@
+PMC2CV = $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --vtable @no_lines_flag@
 
 .pmc.dump : # suffix rule (limited support)
 	$(PMC2CD) $<
@@ -860,7 +860,7 @@
         src/io/io_private.h \
         include/pmc/pmc_socket.h
 
-O_FILES := \
+O_FILES = \
     $(INTERP_O_FILES) \
     $(CHARSET_O_FILES) \
     $(IO_O_FILES) \
@@ -1474,43 +1474,43 @@
 
 # The --running-make-test argument is currently used by long-running tests
 # to disable GC_DEBUG.
-EXTRA_TEST_ARGS := --gc-debug --running-make-test
-DISTRO_TEST_FILES := \
+EXTRA_TEST_ARGS = --gc-debug --running-make-test
+DISTRO_TEST_FILES = \
     t/distro/*.t
-BENCHMARK_TEST_FILES := \
+BENCHMARK_TEST_FILES = \
     t/benchmark/*.t
-PERL_TEST_FILES := \
+PERL_TEST_FILES = \
     t/perl/*.t
-CODINGSTD_TEST_FILES := \
+CODINGSTD_TEST_FILES = \
     t/codingstd/*.t
-RUN_TEST_FILES := \
+RUN_TEST_FILES = \
     t/run/*.t
-RUNCORE_TEST_FILES := \
+RUNCORE_TEST_FILES = \
     --runcore-tests
-SRC_TEST_FILES := \
+SRC_TEST_FILES = \
     t/src/*.t
-TOOLS_TEST_FILES := \
+TOOLS_TEST_FILES = \
     t/tools/*.t
-LIBRARY_TEST_FILES := @library_tests@
-PMC2CUTILS_DIR := t/tools/pmc2cutils
-OPS2PMUTILS_DIR := t/tools/ops2pm
-OPS2CUTILS_DIR := t/tools/ops2cutils
-REVISIONUTILS_DIR := t/tools/revision
-HARNESS_DIR := t/pharness
-BUILDTOOLS_TEST_FILES := \
+LIBRARY_TEST_FILES = @library_tests@
+PMC2CUTILS_DIR = t/tools/pmc2cutils
+OPS2PMUTILS_DIR = t/tools/ops2pm
+OPS2CUTILS_DIR = t/tools/ops2cutils
+REVISIONUTILS_DIR = t/tools/revision
+HARNESS_DIR = t/pharness
+BUILDTOOLS_TEST_FILES = \
     $(PMC2CUTILS_DIR)/*.t \
     $(OPS2PMUTILS_DIR)/*.t \
     $(OPS2CUTILS_DIR)/*.t \
     $(REVISIONUTILS_DIR)/*.t \
     $(HARNESS_DIR)/*.t
-MANIFEST_DIR := t/manifest
-INSTALL_TOOLS_DIR := t/tools/install
-MANIFEST_TEST_FILES := \
+MANIFEST_DIR = t/manifest
+INSTALL_TOOLS_DIR = t/tools/install
+MANIFEST_TEST_FILES = \
     $(MANIFEST_DIR)/*.t \
     $(INSTALL_TOOLS_DIR)/*.t
-EXAMPLES_TEST_FILES := \
+EXAMPLES_TEST_FILES = \
     t/examples/*.t
-CONFIGURE_TEST_FILES := \
+CONFIGURE_TEST_FILES = \
     t/configure/*.t \
     t/steps/*.t
 
@@ -1866,16 +1866,16 @@
 patch :
 	svn diff
 
-LINTABLE_CFILES := `echo src/main$(O) $(O_FILES) src/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
 
-SUNLINT := lint
+SUNLINT = lint
 
 # This target does sneaky magic to get the $(NOTE) fields to work.  It's
 # doing replaces in $(NOTE), which is empty, of strings that will never match.
-NOTE :=
-SUNLINT_HUSH_OPTS := \
+NOTE =
+SUNLINT_HUSH_OPTS = \
     $(NOTE:% Errors that will never be silenced, and we must always hush =%)\
     -erroff=E_ARGUMENT_CONVERT          $(NOTE:% implicit integer-to-long conversion =%) \
     -erroff=E_BAD_PTR_CAST                    $(NOTE:% pointer casts may be troublesome =%) \
@@ -1896,10 +1896,10 @@
     -erroff=E_CASE_FALLTHRU                    $(NOTE:% case fallthru =%) \
     -erroff=E_STATIC_UNUSED                    $(NOTE:% Static function not used =%) \
 
-SUNLINT_OPTS_FOR_THE_FUTURE := -b -m -Xc
+SUNLINT_OPTS_FOR_THE_FUTURE = -b -m -Xc
 
 # Lint options at: http:////docs.sun.com//app//docs//doc//819-5265//6n7c29cli?a=view
-SUNLINTOPTS := \
+SUNLINTOPTS = \
     -b \
     -p \
     -fd \
@@ -1916,7 +1916,7 @@
 	rm -f *.ln
 	$(SUNLINT) $(CC_INC) "-Iinclude/pmc" $(SUNLINTOPTS) $(LINTABLE_CFILES)
 
-BSD_LINT_FLAGS := -a -aa -b -c -e -h -n -p -r -u -x -z -F -H -V
+BSD_LINT_FLAGS = -a -aa -b -c -e -h -n -p -r -u -x -z -F -H -V
 
 # 132: conversion from '...' may lose accuracy
 # 135: possible pointer alignment problem
@@ -1929,7 +1929,7 @@
 # 265: ANSI C does not support 'long long'
 # 277: initialisation of '...' with '...'
 # 278: combination of '...' and '...', arg #...
-BSD_LINT_EXCLUSIONS := -X132,135,236,241,247,249,259,265,277,278
+BSD_LINT_EXCLUSIONS = -X132,135,236,241,247,249,259,265,277,278
 
 bsdlint : $(PARROT)
 	rm -f *.ln
@@ -1937,11 +1937,11 @@
 
 # For checking with splint see also http:////www.perlfoundation.org//parrot//index.cgi?splint
 # Splint: http:////splint.org
-SPLINT := splint
+SPLINT = splint
 
 # Temp directory for splint.  Add +keep to splintflags if you want work files
 # kept in there after completion.
-SPLINT_TMP := $(TEMPDIR)/splint
+SPLINT_TMP = $(TEMPDIR)/splint
 
 # Splint flags: http://splint.org/manual/html/appB.html
 # The dashes in the names don't make any difference to Splint, but I've
@@ -1976,7 +1976,7 @@
     -include-nest 10
 
 # Memory safety checks
-SPLINTFLAGS := $(SPLINTFLAGS) \
+SPLINTFLAGS = $(SPLINTFLAGS) \
     +bufferoverflow \
     +bufferoverflowhigh \
     +read-only-strings \
@@ -1986,7 +1986,7 @@
     +use-released \
 
 # Macro safety checks
-SPLINTFLAGS := $(SPLINTFLAGS) \
+SPLINTFLAGS = $(SPLINTFLAGS) \
     +macro-assign \
     +macro-empty \
     +macro-parens \
@@ -1995,25 +1995,25 @@
     +macro-unrecog \
 
 # Watch for unsafe comparisons
-SPLINTFLAGS := $(SPLINTFLAGS) \
+SPLINTFLAGS = $(SPLINTFLAGS) \
     +bool-compare \
     +ptr-compare \
     +real-compare \
     +unsigned-compare
 
 # But allow us some slop in boolean comparisons
-SPLINTFLAGS := $(SPLINTFLAGS) \
+SPLINTFLAGS = $(SPLINTFLAGS) \
     -pred-bool-int \
     -pred-bool-ptr \
     -pred-bool-others \
     -boolops \
 
 # Report qualifier mismatches only if dangerous
-SPLINTFLAGS := $(SPLINTFLAGS) \
+SPLINTFLAGS = $(SPLINTFLAGS) \
     +relax-quals
 
 # Memory checking
-SPLINTFLAGS := $(SPLINTFLAGS) \
+SPLINTFLAGS = $(SPLINTFLAGS) \
     -must-free \
     -mustfreefresh \
     -mustfreeonly \
@@ -2025,33 +2025,33 @@
     -zero-ptr \
 
 # Transfer errors are too tough for us right now
-SPLINTFLAGS := $(SPLINTFLAGS) \
+SPLINTFLAGS = $(SPLINTFLAGS) \
     -mem-trans
 
 # Symbol definitions
-SPLINTFLAGS := $(SPLINTFLAGS) \
+SPLINTFLAGS = $(SPLINTFLAGS) \
     +decl-undef \
     +incon-defs \
     +incon-defs-lib \
 
 # Check for conflicts with C++ compilers
-SPLINTFLAGS := $(SPLINTFLAGS) \
+SPLINTFLAGS = $(SPLINTFLAGS) \
     +cpp-names \
 
 # Format codes
-SPLINTFLAGS := $(SPLINTFLAGS) \
+SPLINTFLAGS = $(SPLINTFLAGS) \
     +format-code \
     +format-type \
 
 # Problems with evaluation and control structions
-SPLINTFLAGS := $(SPLINTFLAGS) \
+SPLINTFLAGS = $(SPLINTFLAGS) \
     +controlnestdepth 15 \
     +duplicate-case \
     +eval-order \
     +eval-order-uncon \
 
 # Types and stuff
-SPLINTFLAGS := $(SPLINTFLAGS) \
+SPLINTFLAGS = $(SPLINTFLAGS) \
     +char-index \
     +char-int \
     +enum-members \
@@ -2070,7 +2070,7 @@
 # added to splint target to simplify experimentation,
 # ex: make SPLINTFLAGS_TEST='-posixstrictlib +posixlib' splint
 
-SPLINT_SOURCE := `echo $(O_FILES) | $(PERL) -pe @PQ at s/\.o/\.c/g at PQ@`
+SPLINT_SOURCE = `echo $(O_FILES) | $(PERL) -pe @PQ at s/\.o/\.c/g at PQ@`
 
 splint-all : $(PARROT)
 	$(MKPATH) $(SPLINT_TMP)
@@ -2090,8 +2090,8 @@
 	$(SPLINT_SOURCE) \
 		| grep -v 'Source code error generation point'
 
-COVER_FLAGS := -fprofile-arcs -ftest-coverage
-COVER_DIRS := \
+COVER_FLAGS = -fprofile-arcs -ftest-coverage
+COVER_DIRS = \
     src \
     src/call \
     src/dynoplibs \
@@ -2314,7 +2314,7 @@
 
 tags.vi.dummy:
 
-CRITIC_FILES := 'lib/Parrot'
+CRITIC_FILES = 'lib/Parrot'
 
 perlcritic:
 	perlcritic --profile tools/util/perlcritic.conf $(CRITIC_FILES)
@@ -2328,7 +2328,7 @@
 # is not PARROT_EXPORT but should be, then put PARROT_EXPORT in the C file and
 # run "make headerizer".  The .h file will get updated.
 
-HEADERIZER_O_FILES := \
+HEADERIZER_O_FILES = \
     $(O_FILES) \
     src/packdump$(O) \
     src/pbc_merge$(O) \

Modified: branches/one_make/lib/Parrot/Configure/Compiler.pm
==============================================================================
--- branches/one_make/lib/Parrot/Configure/Compiler.pm	Wed Jan  6 01:47:11 2010	(r43391)
+++ branches/one_make/lib/Parrot/Configure/Compiler.pm	Wed Jan  6 01:56:43 2010	(r43392)
@@ -380,7 +380,6 @@
         if ( $options{file_type} eq 'makefile' ) {
             $options{replace_slashes}   = 1;
             $options{conditioned_lines} = 1;
-            $options{no_simply_expanded_var} = ! $conf->data->get('gmake_version');
         }
     }
 
@@ -564,11 +563,6 @@
             $line =~ s{(\\\*)}{\\$1}g;
         }
 
-        if ( $options{no_simply_expanded_var} ) {
-            # replace := with =
-            $line =~ s{:=}{=};
-        }
-
         print $out $line;
     }
 


More information about the parrot-commits mailing list