Index: parrot-svn/config/gen/makefiles/dynoplibs.in =================================================================== --- parrot-svn.orig/config/gen/makefiles/dynoplibs.in 2009-02-27 08:30:39.046875000 +0100 +++ parrot-svn/config/gen/makefiles/dynoplibs.in 2009-02-27 14:15:37.078125000 +0100 @@ -7,6 +7,7 @@ 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@ -c @@ -22,8 +23,7 @@ BUILD_TOOLS_DIR := $(BUILD_DIR)@slash@tools@slash@build OPS2C := $(PERL) -I$(BUILD_DIR)@slash@lib $(BUILD_TOOLS_DIR)@slash@ops2c.pl INCLUDES := -I$(BUILD_DIR)@slash@include -I@build_dir@@slash@src@slash@pmc -#IF(win32):LINKARGS := @libs@ @icu_shared@ $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) -#ELSE:LINKARGS := $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) +LINKARGS := $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @icu_shared@ @libs@ OPS_TARGETS := \ #IF(cg_flag): myops_ops_cg$(LOAD_EXT) \ @@ -38,20 +38,23 @@ CLEANUPS := \ "*.c" \ "*.h" \ - "*$(O)" \ +#IF(o): "*@o@" \ #IF(win32): "*.lib" \ #IF(win32): "*.pdb" \ #IF(win32): "*.ilk" \ #IF(win32): "*.exp" \ #IF(win32): "*.def" \ #IF(win32): "*.manifest" \ - "*$(LOAD_EXT)" +#IF(load_ext): "*@load_ext@" all : $(OPS_TARGETS) -#IF(cygwin or hpux): CHMOD 0775 "*$(LOAD_EXT)" +#IF(cygwin or hpux): $(CHMOD) 0775 "*$(LOAD_EXT)" $(CP) "*$(LOAD_EXT)" $(INSTALL_DIR) +#IF(cygwin or hpux): $(CHMOD) 0775 "$(INSTALL_DIR)/*$(LOAD_EXT)" +Makefile: ../../config/gen/makefiles/dynoplibs.in + cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::makefiles --target=src/dynoplibs/Makefile myops_ops$(LOAD_EXT): myops_ops$(O) $(LD) $(LD_OUT)myops_ops$(LOAD_EXT) myops_ops$(O) $(LINKARGS) Index: parrot-svn/config/gen/makefiles/dynpmc.in =================================================================== --- parrot-svn.orig/config/gen/makefiles/dynpmc.in 2009-02-27 08:30:39.048875000 +0100 +++ parrot-svn/config/gen/makefiles/dynpmc.in 2009-02-28 11:49:59.453125000 +0100 @@ -7,6 +7,7 @@ CHMOD := @chmod@ LOAD_EXT := @load_ext@ BUILD_DIR := @build_dir@ +RECONFIGURE := $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl INSTALL_DIR := $(BUILD_DIR)@slash@runtime@slash@parrot@slash@dynext O := @o@ CC := @cc@ -c @@ -23,9 +24,8 @@ BUILD_LIB_DIR := $(BUILD_DIR)@slash@blib@slash@lib PMC2C := $(PERL) $(BUILD_TOOLS_DIR)@slash@pmc2c.pl INCLUDES := -I$(BUILD_DIR)@slash@include -I@build_dir@@slash@src@slash@pmc -#IF(win32):LINKARGS := @libs@ @icu_shared@ $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) -#ELSIF(cc==gcc):LINKARGS := -Wl,-L $(BUILD_LIB) $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) -#ELSE:LINKARGS := $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) +#IF(!cygwin and cc==gcc):LINKARGS := -Wl,-L $(BUILD_LIB_DIR) $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @icu_shared@ @libs@ +#ELSE: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 @@ -78,22 +78,25 @@ "pmc_*.h" \ "*_group.h" \ "*.dump" \ - "*$(O)" \ +#IF(o): "*@o@" \ #IF(win32): "*.lib" \ #IF(win32): "*.pdb" \ #IF(win32): "*.ilk" \ #IF(win32): "*.exp" \ #IF(win32): "*.def" \ #IF(win32): "*.manifest" \ - "*$(LOAD_EXT)" +#IF(load_ext): "*@load_ext@" all : install install : $(PMC_TARGETS) -#IF(cygwin or hpux): CHMOD 0775 "*$(LOAD_EXT)" +#IF(cygwin or hpux): $(CHMOD) 0775 "*$(LOAD_EXT)" $(CP) "*$(LOAD_EXT)" $(INSTALL_DIR) +#IF(cygwin or hpux): $(CHMOD) 0775 "$(INSTALL_DIR)/*$(LOAD_EXT)" +Makefile: ../../config/gen/makefiles/dynpmc.in + cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::makefiles --target=src/dynpmc/Makefile dynlexpad$(LOAD_EXT): dynlexpad$(O) $(LD) $(LD_OUT)dynlexpad$(LOAD_EXT) dynlexpad$(O) $(LINKARGS)