Author: rafl
Date: Sun Oct 30 16:47:50 2005
New Revision: 9670
Modified:
/ (props changed)
trunk/config/gen/makefiles/root.in
Log:
[EMAIL PROTECTED]: rafl | 2005-10-31 01:47:22 +0100
* Substitute installable_parrot with a dynamically linked version when running
make shared.
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in (original)
+++ trunk/config/gen/makefiles/root.in Sun Oct 30 16:47:50 2005
@@ -741,7 +741,9 @@ check_source : $(GENERAL_H_FILES)
#
###############################################################################
-shared : $(GEN_HEADERS) blib/lib/libparrot$(SHARE_EXT).$(SOVERSION)
$(LIBPARROT)
+shared : $(GEN_HEADERS) blib/lib/libparrot$(SHARE_EXT).$(SOVERSION)
$(LIBPARROT) $(INSTALLABLEPARROT)
+ $(LINK) ${ld_out}$(INSTALLABLEPARROT) $(LINKFLAGS) $(IMCC_DIR)/main$(O)
$(ICU_SHARED) $(C_LIBS) -Lblib/lib -lparrot $(SRC_DIR)/install_config$(O)
+
static : $(GEN_HEADERS) $(LIBPARROT)
# XXX changes don't always propagate into libparrot
@@ -758,6 +760,7 @@ $(LIBPARROT) : $(O_FILES)
blib/lib/libparrot$(SHARE_EXT).$(SOVERSION) : $(O_FILES)
$(MKDIR) blib blib/lib
$(LD) -Wl,-soname=libparrot$(SHARE_EXT).$(SOVERSION) $(LD_SHARE_FLAGS)
$(LDFLAGS) ${ld_out}blib/lib/libparrot$(SHARE_EXT).$(SOVERSION) $(O_FILES)
$(C_LIBS) $(LIBICUCORE) $(LIBICUDATA)
+ cp blib/lib/libparrot$(SHARE_EXT).$(SOVERSION)
blib/lib/libparrot$(SHARE_EXT)
$(PARROT_SO) : $(IMCC_DIR)/main$(O) blib/lib/libparrot$(SHARE_EXT)
lib/Parrot/OpLib/core.pm
$(LINK) $(LINKFLAGS) ${ld_out}$(PARROT) $(IMCC_DIR)/main$(O) \
